Fixed Object Count
Merge commit '556f3b7ae583ab91f62467d5e44c0c4a7e97f012'