Improved drag&drop handling, should fix #224