Improve the fix.