fixed flippable on reset
Merge remote-tracking branch 'origin/fix-flipable-on-reset'