Fixed some issue with comment counter not showing all the time