Fix drag/drop bug