Added more changes on collection count issue
Merge pull request #344 from skpcharles/master

Added more changes on collection count issue