trying to fix handling of non-matching lines.