Fixed bootstrapping to work