Fix for #721