Trying to fix the fix of the fix