DanM fixed drag and drop duplication error. for real this time