Fixed move flipping issue
Merge branch 'fixing-move-logic'