Make AHC 1.9 and AHC2 code converge, close #638