Fixing the fix of the fix