diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
index 95c2608bf09b48c4b4a85d15138957e4af7a8a63..c3543538f265bec0f4b8602be01756b1b82c58ed 100644
--- a/libraries/chain/wasm_interface.cpp
+++ b/libraries/chain/wasm_interface.cpp
@@ -468,9 +468,10 @@ class privileged_api : public context_aware_api {
       /// TODO: add inline/deferred with support for arbitrary permissions rather than code/current auth
 };
 
-class checktime_api : public context_free_api {
+class checktime_api : public context_aware_api {
 public:
-   using context_free_api::context_free_api;
+   checktime_api( wasm_interface& wasm )
+   :context_aware_api(wasm,true){}
 
    void checktime(uint32_t instruction_count) {
       context.checktime(instruction_count);
@@ -574,9 +575,10 @@ class string_api : public context_aware_api {
       }
 };
 
-class system_api : public context_free_api {
+class system_api : public context_aware_api {
    public:
-      using context_free_api::context_free_api;
+      system_api( wasm_interface& wasm )
+      :context_aware_api(wasm,true){}
 
       void abort() {
          edump(("abort() called"));