Fix crash for round 5 fixes.