diff --git a/internal/ceres/generate_bundle_adjustment_tests.py b/internal/ceres/generate_bundle_adjustment_tests.py
index b36cf66..89cf8c7 100644
--- a/internal/ceres/generate_bundle_adjustment_tests.py
+++ b/internal/ceres/generate_bundle_adjustment_tests.py
@@ -121,15 +121,17 @@
 
 TEST_F(BundleAdjustmentTest,
        %(test_class_name)s) {  // NOLINT
-   Solver::Options options = *BundleAdjustmentProblem().mutable_solver_options();
-   options.num_threads = %(num_threads)s;
-   options.linear_solver_type = %(linear_solver)s;
-   options.sparse_linear_algebra_library_type = %(sparse_backend)s;
-   options.preconditioner_type = %(preconditioner)s;
+   BundleAdjustmentProblem bundle_adjustment_problem;
+   Solver::Options* options = bundle_adjustment_problem.mutable_solver_options();
+   options->num_threads = %(num_threads)s;
+   options->linear_solver_type = %(linear_solver)s;
+   options->sparse_linear_algebra_library_type = %(sparse_backend)s;
+   options->preconditioner_type = %(preconditioner)s;
    if (%(ordering)s) {
-    options.linear_solver_ordering.reset();
+    options->linear_solver_ordering.reset();
    }
-  RunSolverForConfigAndExpectResidualsMatch(options);
+   Problem* problem = bundle_adjustment_problem.mutable_problem();
+   RunSolverForConfigAndExpectResidualsMatch(*options, problem);
 }
 
 }  // namespace internal