Baseline
Fixed counting bug