Fix count()