Fix yet another CP1 bug.