added more changes on collection count issue
Merge pull request #346 from skpcharles/master

added more changes on collection count issue