Fix duck count as well.
Merge branch 'master' into production