Drag and drop more robust