Finish partial fix.