Refactor plus fix.