2nd attempt to fix bootstrapping