Fix for the Fix