diff --git a/tf_fuzz/tfz-cpp/tf_fuzz.cpp b/tf_fuzz/tfz-cpp/tf_fuzz.cpp
index 4be4a1d..f11c29d 100644
--- a/tf_fuzz/tfz-cpp/tf_fuzz.cpp
+++ b/tf_fuzz/tfz-cpp/tf_fuzz.cpp
@@ -24,6 +24,7 @@
 #include "psa_call.hpp"
 #include "tf_fuzz_grammar.tab.hpp"
 #include "variables.hpp"
+#include "crypto_model.hpp"
 
 
 extern FILE* yyin;  // telling lex&yacc which file to parse
@@ -253,6 +254,7 @@
         IV(cout << "    " << this_call->call_description << " for asset "
                 << this_call->asset_info.get_name() << endl;)
 
+        this_call->copy_policy_to_call();
         this_call->simulate();
         this_call->copy_call_to_asset();
            /* Note:  this_call->the_asset will now point to the asset
@@ -493,6 +495,8 @@
     // Allocate "the world":
     tf_fuzz_info *rsrc = new tf_fuzz_info;
 
+    crypto_model::init_crypto_model();
+
     // Parse parameters and open files:
     rsrc->parse_cmd_line_params (argc, argv);