Remaining part of fix.