MHAPI code review fix part two