fixed the wrong comments getting shown issue