Bugfix for Drag and Drop Support