Fixing dragging of Rect and Arc marks