Fix for comments order