fixed comments last