Fix count command