Drag and drop bug-fix