Improved drag n drop according to the issue #46