Fix for #577 First Release