Drag and drop bugfix