Fix count problem