diff --git a/src/main/scala/leon/repair/Repairman.scala b/src/main/scala/leon/repair/Repairman.scala
index 1003e6f0e0c950ca16ce13719ed36d81fcb8640a..31abd59c173608682f6e39594e8154a25f286494 100644
--- a/src/main/scala/leon/repair/Repairman.scala
+++ b/src/main/scala/leon/repair/Repairman.scala
@@ -121,9 +121,10 @@ class Repairman(ctx: LeonContext, initProgram: Program, fd: FunDef, verifTimeout
                 // Validate solution if not trusted
                 if (!sol.isTrusted) {
                   reporter.info("Found untrusted solution! Verifying...")
-                  val (npr, fds) = synth.solutionToProgram(sol)
+                  val expr = sol.toSimplifiedExpr(ctx, program)
+                  ci.ch.impl = Some(expr)
       
-                  getVerificationCounterExamples(fds.head, npr) match {
+                  getVerificationCounterExamples(ci.fd, program) match {
                     case NotValid(_, ces) if !ces.isEmpty =>
                       reporter.error("I ended up finding this counter example:\n"+ces.mkString("  |  "))