Another fix with dragging