drag-drop bug fix attempt