bug fix drag drop