diff --git a/src/01/01/z2ui5_cl_core_srv_draft.clas.abap b/src/01/01/z2ui5_cl_core_srv_draft.clas.abap
index 3749c185..619f90d0 100644
--- a/src/01/01/z2ui5_cl_core_srv_draft.clas.abap
+++ b/src/01/01/z2ui5_cl_core_srv_draft.clas.abap
@@ -113,9 +113,11 @@ CLASS z2ui5_cl_core_srv_draft IMPLEMENTATION.
 
   METHOD count_entries.
 
-    SELECT COUNT( * )
+  data lt_tab type standard table of z2ui5_t_01 with empty key.
+    SELECT id
       FROM z2ui5_t_01
-      INTO @result.
+      INTO corresponding fields of table @result.
+  result = lines( lt_tab ).
 
   ENDMETHOD.
 ENDCLASS.