Fixing drag and drop. Authors: nmcmahon1215 ghfranzini