Bootstrapped a temporary fix