fix ido-hacks upstream