Fixing the fixes