Fixed so that the drag-and-drop works correctly