MHAPI code review fix