Fixed location for moving shapes to my matches, see #46