diff --git a/src/aeso_abi.erl b/src/aeso_abi.erl
index cea7c45..455ba21 100644
--- a/src/aeso_abi.erl
+++ b/src/aeso_abi.erl
@@ -40,8 +40,8 @@
 %%% Handle calldata
 
 create_calldata(FunName, Args, ArgTypes, RetType) ->
-    <<TypeHashInt:?HASH_SIZE/unit:8>> =
-        function_type_hash(list_to_binary(FunName), ArgTypes, RetType),
+    {<<TypeHashInt:?HASH_SIZE/unit:8>>, _, _, _} =
+        function_type_info(list_to_binary(FunName), ArgTypes, RetType),
     Data = aeso_heap:to_binary({TypeHashInt, list_to_tuple(Args)}),
     {ok, Data, {tuple, [word, {tuple, ArgTypes}]}, RetType}.
 
diff --git a/src/aeso_compiler.erl b/src/aeso_compiler.erl
index 783613c..18354cc 100644
--- a/src/aeso_compiler.erl
+++ b/src/aeso_compiler.erl
@@ -273,7 +273,7 @@ translate_vm_value(_VmType, _Type, _Data) ->
 
 -spec create_calldata(string(), string(), [string()]) ->
                              {ok, binary(), aeso_sophia:type(), aeso_sophia:type()}
-                                 | {error, argument_syntax_error}.
+                             | {error, term()}.
 create_calldata(Code, Fun, Args) ->
     case check_call(Code, Fun, Args, []) of
         {ok, FunName, {ArgTypes, RetType}, VMArgs} ->