Fix ShiftCoordinates