Fixed #2: Dragging messes up state