Fix to bootstrap addition