better handling of _ when bootstrapping