Merge pull request #570 from ppalaga/i560

Fix #560 AHC extension