diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R
index 53a7c82fb5e..fd19d0d0f00 100644
--- a/instat/static/InstatObject/R/instat_object_R6.R
+++ b/instat/static/InstatObject/R/instat_object_R6.R
@@ -1921,14 +1921,14 @@ DataBook$set("public", "export_workspace", function(data_names, file, include_gr
   for(temp_name in data_names) {
     e[[temp_name]] <- self$get_data_frame(temp_name, use_current_filter = FALSE)
     if(include_graphs) {
-      graphs <- self$get_graphs(temp_name)
+      graphs <- self$get_objects(data_name = temp_name, object_type_label = "graph")
       graph_names <- names(graphs)
       for(i in seq_along(graphs)) {
         e[[paste(temp_name, graph_names[i], sep = "_")]] <- graphs[[i]]
       }
     }
     if(include_models) {
-      models <- self$get_models(temp_name)
+      models <- self$get_objects(data_name = temp_name, object_type_label = "model")
       model_names <- names(models)
       for(i in seq_along(models)) {
         e[[paste(temp_name, model_names[i], sep = "_")]] <- models[[i]]