Fix second-turn bug