Fixing the fixes.