Indicator Count counts better (fixed #27)