diff --git a/src/mol-model/structure/structure/element/stats.ts b/src/mol-model/structure/structure/element/stats.ts
index 1af62b97ca37881a49bc0875166c9c29a4f4f145..a26a52ceba11b9ac2a4b16f6b45ffc9851451cf5 100644
--- a/src/mol-model/structure/structure/element/stats.ts
+++ b/src/mol-model/structure/structure/element/stats.ts
@@ -52,13 +52,15 @@ export namespace Stats {
                 const { index, offsets } = unit.model.atomicHierarchy.residueAtomSegments
                 let i = 0
                 while (i < size) {
+                    let j = 0
                     const eI = elements[OrderedSet.getAt(indices, i)]
                     const rI = index[eI]
                     while (i < size && index[elements[OrderedSet.getAt(indices, i)]] === rI) {
                         ++i
+                        ++j
                     }
 
-                    if (offsets[rI + 1] - offsets[rI] === i) {
+                    if (offsets[rI + 1] - offsets[rI] === j) {
                         // full residue
                         stats.residueCount += 1
                         if (stats.residueCount === 1) {
@@ -66,7 +68,7 @@ export namespace Stats {
                         }
                     } else {
                         // partial residue
-                        stats.elementCount += i
+                        stats.elementCount += j
                     }
                 }
             } else {