Fixed whole objects count