add fixes for Comment()