Fix for #753