comment order bug fixed