Fix flipping by using the corner controls

This commit fixes the issues that occured in pull request #694