diff --git a/s7.py b/s7.py
index 3099c48..69e3d55 100755
--- a/s7.py
+++ b/s7.py
@@ -48,7 +48,7 @@ def get_by_order():
                     r[2],  # No of Tree
                     m,  # model
                 ] + r[7:]
-                row.append(get_yynn_count(r[7:]))  # ??????????
+                row.append(get_yynn_count(r))  # ??????????
                 result.append(row)
                 count += 1
                 if count >= TOTAL and TOTAL > 0:
@@ -71,7 +71,7 @@ def get_by_random():
                     r[2],  # No of Tree
                     m,  # model
                 ] + r[7:]
-                l.append(get_yynn_count(r[7:]))  # ??????????
+                l.append(get_yynn_count(r))  # ??????????
                 lo_list.append(l)
 
         picked = []
@@ -124,7 +124,7 @@ def get_by_group(model_name, step, **kwargs):
                     _r[i] = '%s*' % calibrator[i]
                 else:  # one Y one N
                     _r[i] = 'Y/N*'
-            _r.append(get_yynn_count(r[7:]))  # ??????????
+            _r.append(get_yynn_count(_r))  # ??????????
             result.append(_r)
             calibrator = _r[:]