fixed drag & drop issue #10