diff --git a/src/plugins/callgraph/cg.ml b/src/plugins/callgraph/cg.ml
index a5363fdb19eb75b280969f96a61ade45c75e37e2..5daf8249498f3ebf1ed13cff9c0a9929fd05e3cb 100644
--- a/src/plugins/callgraph/cg.ml
+++ b/src/plugins/callgraph/cg.ml
@@ -205,7 +205,7 @@ let syntactic_compute g =
 let semantic_compute g =
   Globals.Functions.iter
     (fun kf ->
-       let callers = !Db.Value.callers kf in
+       let callers = Eva.Results.callsites kf in
        let must_add =
          callers <> []  (* the function is called *)
          || is_entry_point kf
diff --git a/tests/value/oracle/loopfun.0.res.oracle b/tests/value/oracle/loopfun.0.res.oracle
index c7543f7da625ee78a4aa75d0e958968a19680090..cc02d7626c304a49b207b43061c0a01f901e8e97 100644
--- a/tests/value/oracle/loopfun.0.res.oracle
+++ b/tests/value/oracle/loopfun.0.res.oracle
@@ -42,23 +42,27 @@
 [eva] Recording results for main
 [eva] done for function main
 [eva] ====== VALUES COMPUTED ======
+[from] Computing for function main
+[from] Done for function main
 [from] Computing for function main2
 [from] Done for function main2
 [from] Computing for function test
 [from] Done for function test
-[from] Computing for function main
-[from] Done for function main
 [from] ====== DEPENDENCIES COMPUTED ======
   These dependencies hold at termination for the executions that terminate:
+[from] Function main:
+  FROMTOP
+  \result FROM ANYTHING(origin:Unknown)
 [from] Function main2:
   FROMTOP
 [from] Function test:
   FROMTOP
   \result FROM ANYTHING(origin:Unknown)
-[from] Function main:
-  FROMTOP
-  \result FROM ANYTHING(origin:Unknown)
 [from] ====== END OF DEPENDENCIES ======
+[inout] Out (internal) for function main:
+    ANYTHING(origin:Unknown)
+[inout] Inputs for function main:
+    ANYTHING(origin:Unknown)
 [inout] Out (internal) for function main2:
     \nothing
 [inout] Inputs for function main2:
@@ -67,7 +71,3 @@
     tmp; a
 [inout] Inputs for function test:
     a
-[inout] Out (internal) for function main:
-    ANYTHING(origin:Unknown)
-[inout] Inputs for function main:
-    ANYTHING(origin:Unknown)