diff --git a/src/assessment/sus.lisp b/src/assessment/sus.lisp
index 2ce25f8..b35135d 100644
--- a/src/assessment/sus.lisp
+++ b/src/assessment/sus.lisp
@@ -20,11 +20,14 @@
 
 (defclass sus-calculator (calculator) ())
 
+(defun sus-response-entries-process (entries)
+  (reverse-pairs (aggregate-values-per-group #'sus-response-entry-process entries)))
+
 (defmethod calculator-calc-results ((calc sus-calculator) responses)
   (mapcar (lambda (response)
-            (destructuring-bind (timestamp &rest answers) response
-              (let ((values (reverse-pairs (aggregate-values-per-group #'sus-response-entry-process answers))))
-                (list* :TIMESTAMP timestamp (nconc values (sus-calc-score values))))))
+            (destructuring-bind (timestamp &rest entries) response
+              (let ((sus-values (sus-response-entries-process entries)))
+                (list* :TIMESTAMP timestamp (nconc sus-values (sus-calc-score sus-values))))))
           responses))
 
 ;;;