Fixed breakage of comments