Fix duck count as well.