fixed comment ordering