fixed onZero and counts in general