Fixed dragging issues