fix bug in HC, IHC, HGA, GA
refactoring