[cvs-nhc98] Fix for Mark Tehver's bug report.