Another drag and drop bug fix