order of comments fixed