Fixed drag-n-drop issue