Account for comments properly