And a fix for the fix.