fixed dragging and states