fix order of comments