diff --git a/src/main/scala/leon/purescala/FunctionClosure.scala b/src/main/scala/leon/purescala/FunctionClosure.scala
index 20dbd1eeced9c951221665b2a3136b2225681c86..65fd1de8a934bb802f57a39f95e17721e6e78f95 100644
--- a/src/main/scala/leon/purescala/FunctionClosure.scala
+++ b/src/main/scala/leon/purescala/FunctionClosure.scala
@@ -130,7 +130,12 @@ object FunctionClosure extends TransformationPhase {
     val freshVals = (inner.paramIds ++ free).map{_.freshen}.map(instantiateType(_, tparamsMap))
     val freeMap   = (inner.paramIds ++ free).zip(freshVals).toMap
 
-    val newFd = inner.duplicate(inner.id.freshen, inner.tparams ++ tpFresh, freshVals.map(ValDef(_)), instantiateType(inner.returnType, tparamsMap))
+    val newFd = inner.duplicate(
+      inner.id.freshen,
+      inner.tparams ++ tpFresh,
+      freshVals.map(ValDef(_)),
+      instantiateType(inner.returnType, tparamsMap)
+    )
     newFd.precondition = Some(and(pc, inner.precOrTrue))
 
     val instBody = instantiateType(
@@ -154,11 +159,7 @@ object FunctionClosure extends TransformationPhase {
   override def apply(ctx: LeonContext, program: Program): Program = {
     val newUnits = program.units.map { u => u.copy(defs = u.defs map {
       case m: ModuleDef =>
-        ModuleDef(
-          m.id,
-          m.definedClasses ++ m.definedFunctions.flatMap(close),
-          m.isPackageObject
-        )
+        m.copy(defs = m.definedClasses ++ m.definedFunctions.flatMap(close))
       case cd =>
         cd
     })}