Counting: fixes #757
Counting: fixes #758