diff --git a/src/baseexpression.h b/src/baseexpression.h
index 273274e..5bdfb3d 100644
--- a/src/baseexpression.h
+++ b/src/baseexpression.h
@@ -461,6 +461,7 @@ protected:
 		ModelEnv model_env_local(*model_env);
 		child_model.model_env = &model_env_local;
 		child_model.model_env->has_primary_key_set = child_model.get_has_primary_key_set();
+		child_model.model_env->model = &child_model;
 		child_model.set_connector(model_connector);
 
 		generate_from_model(child_model);
diff --git a/src/modelwrapper.h b/src/modelcontainerwrapper.h
similarity index 100%
rename from src/modelwrapper.h
rename to src/modelcontainerwrapper.h