Is this the only place we needed to change `cfg` ?