Fix bug in Drag and drop