Fix for initial bootstrapping