fixed drag&drop issue