MHAPI code review fix part five