drag and drop bug fix