fixed comments order