MHAPI code review fix part six