Fix for bootstrapped