Fix drag and drop