Fix so AfG scaling is persistent and correct