Made dragging more robust and fixed a bug

1 job for hotfix/drag-and-drop in 39 seconds