Fixed issue with additional comment options.