Drag'n'drop bugfix