Fix count again