[cvs-nhc98] Fix string-gaps for newer hbc.