Extended the fix to comments as well.