switched to count method; gained consistency!
(cherry picked from fb6a050)