Fixes #334 in non-help_text cases