diff --git a/R/datasets.R b/R/datasets.R
index 698f83a..3ee5c2e 100644
--- a/R/datasets.R
+++ b/R/datasets.R
@@ -417,6 +417,7 @@ generate_datasets.SBC_generator_brms <- function(generator, n_sims, n_datasets =
 draws_rvars_to_standata <- function(x) {
   res <- list()
   for(i in 1:posterior::ndraws(x)) {
+    # TODO use direct indexing - subset_draws is unnecessarily slow
     res[[i]] <- draws_rvars_to_standata_single(posterior::subset_draws(x, draw = i))
   }
   res
diff --git a/R/results.R b/R/results.R
index 958a1d3..c3d5c05 100644
--- a/R/results.R
+++ b/R/results.R
@@ -466,8 +466,7 @@ compute_SBC <- function(datasets, backend,
   vars_and_generated_list <- list()
   for(i in 1:length(datasets)) {
     vars_and_generated_list[[i]] <- list(
-      variables = posterior::subset_draws(datasets$variables,
-                                           draw = i),
+      variables = datasets$variables[i,],
       generated = datasets$generated[[i]]
     )
   }