fixed all dragging scenarios