Fix for #605