Fix ShapeMove