Add check and arg to force re-bootstrapping