diff --git a/src/main/java/se/su/dsv/scipro/datatables/CheckListTemplateDataPanel.java b/src/main/java/se/su/dsv/scipro/datatables/CheckListTemplateDataPanel.java
index fc389cafee..b40a403d4e 100644
--- a/src/main/java/se/su/dsv/scipro/datatables/CheckListTemplateDataPanel.java
+++ b/src/main/java/se/su/dsv/scipro/datatables/CheckListTemplateDataPanel.java
@@ -105,7 +105,10 @@ public class CheckListTemplateDataPanel extends Panel {
                 sort = new Sort(Sort.Direction.DESC, getSort().getProperty());
             }
 //            new Sort(Sort.Direction.ASC, getSort().toString())
-            return checklistTemplateService.find(filterString, new PageRequest(table.getCurrentPage(), count, sort)).iterator();
+            
+            //Changed from count to table.getRowsPerPage to make pagination work.
+            //return checklistTemplateService.find(filterString, new PageRequest(table.getCurrentPage(), count, sort)).iterator();
+            return checklistTemplateService.find(filterString, new PageRequest(table.getCurrentPage(), table.getRowsPerPage(), sort)).iterator();
         }
 
         @Override