fixed comments ordering