Fixed double select and dragging issue