Fix to track alignment when dragging