Second part of the fix.