Drag n drop double pickup fix