Fix the broken code (round 2)!