Fix the indexing for the comments