Trying to fix the bootstrapping