fix to the fix to #783