Now it prevens cyclic flips and addresses #283