Fix count cards

Change-Id: I88fcfa79537fd3e5326c63187e754b0d0954c4ce