Quick-fix for comment parsing