fixed ordering of comments