Fix Drag and drop