Fix comment numbers