Fix count methods