Merge pull request #1243 from matrix-israel/SC/Fixencountercat