more flipping fixes