Fix #1487 (Pushing/Dragging boats)