diff --git a/internal/ceres/solver_impl.cc b/internal/ceres/solver_impl.cc
index a070ce6..475e71d 100644
--- a/internal/ceres/solver_impl.cc
+++ b/internal/ceres/solver_impl.cc
@@ -86,7 +86,7 @@
   Evaluator::Evaluate(                                                  \
       original_program,                                                 \
       options.num_threads,                                              \
-      &summary->final_cost,                                             \
+      &summary->which ## _cost,                                         \
       options.return_ ## which ## _residuals ? &summary->which ## _residuals : NULL, \
       options.return_ ## which ## _gradient ? &summary->which ## _gradient : NULL, \
       options.return_ ## which ## _jacobian ? &summary->which ## _jacobian : NULL)
diff --git a/internal/ceres/solver_impl_test.cc b/internal/ceres/solver_impl_test.cc
index d918a57..5cba7d7 100644
--- a/internal/ceres/solver_impl_test.cc
+++ b/internal/ceres/solver_impl_test.cc
@@ -859,6 +859,7 @@
   Solver::Options options;
   Solver::Summary summary;
   double x;
+  options.return_initial_residuals = true;
   problem_impl.AddResidualBlock(new FailingCostFunction, NULL, &x);
   SolverImpl::Solve(options, &problem_impl, &summary);
   EXPECT_EQ(summary.termination_type, NUMERICAL_FAILURE);
@@ -870,6 +871,8 @@
   Solver::Options options;
   Solver::Summary summary;
   double x = 1;
+  options.return_initial_residuals = true;
+  options.return_final_residuals = true;
   problem_impl.AddResidualBlock(new UnaryIdentityCostFunction, NULL, &x);
   problem_impl.SetParameterBlockConstant(&x);
   SolverImpl::Solve(options, &problem_impl, &summary);