Fix bootstrapping issue in previous commit