diff --git a/lib/code/common.ex b/lib/code/common.ex
index 4e00169..a85353b 100644
--- a/lib/code/common.ex
+++ b/lib/code/common.ex
@@ -543,8 +543,7 @@ defmodule Igniter.Code.Common do
     |> Spitfire.Env.expand("file.ex")
     |> elem(3)
     |> then(fn value ->
-      # makes dialyzer happy?
-      {:ok, Map.take(value, Map.keys(%Macro.Env{}))}
+      {:ok, struct(Macro.Env, value)}
     end)
   rescue
     _e ->