Second part of fix.