For reals fix win type counting.