fixup the msh3 logic polish