diff --git a/server/web2py/applications/vidjil/controllers/sample_set.py b/server/web2py/applications/vidjil/controllers/sample_set.py
index 055594cdfb430c6805062bf63376ab15c5504d32..1ac72f19daa63adf935d8e753f45e7023fc7029c 100644
--- a/server/web2py/applications/vidjil/controllers/sample_set.py
+++ b/server/web2py/applications/vidjil/controllers/sample_set.py
@@ -226,7 +226,7 @@ def all():
     slist = SampleSetList(type)
 
     # failsafe if filtered display all results
-    step = len(list) if step is None else step
+    step = len(slist) if step is None else step
     page = 0 if page is None else page
     result = slist.result
 
diff --git a/server/web2py/applications/vidjil/models/sample_set_list.py b/server/web2py/applications/vidjil/models/sample_set_list.py
index 6b3fd9f217a23fc67a73ad7871a1b171594b49f8..7de8b36e97655b807d44ebdb5c2c37f8ebccfd69 100644
--- a/server/web2py/applications/vidjil/models/sample_set_list.py
+++ b/server/web2py/applications/vidjil/models/sample_set_list.py
@@ -98,7 +98,7 @@ class SampleSetList():
         self.result = query_gss
 
     def __len__(self):
-        return len(self.element_ids)
+        return len(self.result)
 
 def filter_by_tags(query, table, tags):
     if tags is not None and len(tags) > 0: