Really fix counting.