Collections count bug fix