Fix  bootstrapping bug