Fix 5488 round 2