Drag and drop bugfixing