Merge pull request #224 from slandelle/ahc-1.7.x

Backport fix for #222 in 1.7.x