Fix the drag and drop problem