Fixes drag and drop