diff --git a/src/aeso_fcode_to_fate.erl b/src/aeso_fcode_to_fate.erl
index 6797bb8..541cb74 100644
--- a/src/aeso_fcode_to_fate.erl
+++ b/src/aeso_fcode_to_fate.erl
@@ -138,7 +138,8 @@ get_variables_registers() ->
 add_variables_register(Env = #env{saved_fresh_names = SavedFreshNames}, Name, Register) ->
     Olds = get_variables_registers(),
     RealName = maps:get(Name, SavedFreshNames, Name),
-    New = {Env#env.contract, Env#env.current_function, RealName},
+    FunName = binary_to_list(make_function_name(Env#env.current_function)),
+    New = {Env#env.contract, FunName, RealName},
     put(variables_registers, Olds#{New => Register}).
 
 -define(tvars, '$tvars').