Fixing count issues.