Fix drag/drop bug...hopefully