Fix issue with displaying comments