Drag drop fix