Get count methods in sync

references commit 528c693ab9f3d7bd1573cef903e0f6aa3a496cf6
Merge branch 'master' into daz