important bug fix in drag-n-drop