Fix for the fix of the fix