Fix flip-flop: Take 2