Count fix again