Fixed drag-n-drop bug