Trying again to fix TODC Bootstrap