MHAPI code review fix part four