fixing drag & drop issue