Fix bootstrap again