Fix whack-a-mole bug