finally fix the the drag and drop