Dragging bugs fix