Fix sub-type count.