diff --git a/main.c b/main.c
index 38019022..3f7a055d 100644
--- a/main.c
+++ b/main.c
@@ -411,7 +411,10 @@ void run_main (int argc, char **argv) {
 #if SEXP_USE_MODULES
       /* reset the environment to have only the `import' binding */
       if (!mods_loaded) {
-        sexp_context_env(ctx) = env = sexp_make_env(ctx);
+        env = sexp_make_env(ctx);
+        sexp_set_parameter(ctx, sexp_context_env(ctx),
+                           sexp_global(ctx, SEXP_G_INTERACTION_ENV_SYMBOL), env);
+        sexp_context_env(ctx) = env;
         sym = sexp_intern(ctx, "repl-import", -1);
         tmp = sexp_env_ref(sexp_global(ctx, SEXP_G_META_ENV), sym, SEXP_VOID);
         sym = sexp_intern(ctx, "import", -1);
diff --git a/tools/chibi-ffi b/tools/chibi-ffi
index d5feb970..7ed23d42 100755
--- a/tools/chibi-ffi
+++ b/tools/chibi-ffi
@@ -1344,7 +1344,7 @@
 (define (generate file)
   (display "/* automatically generated by chibi genstubs */\n")
   (c-system-include "chibi/eval.h")
-  (load file (current-environment))
+  (load file)
   (write-init))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;