Drag and drop fix