Fixed a bug where user counts would be inflated in certain edge cases