Fix dragging issue