#251 Fix issue with wrong count showing