count fixes