fix bootstrapping