diff --git a/cpp/NonlinearOptimizer-inl.h b/cpp/NonlinearOptimizer-inl.h
index 24fd15db9..903f045ff 100644
--- a/cpp/NonlinearOptimizer-inl.h
+++ b/cpp/NonlinearOptimizer-inl.h
@@ -68,7 +68,8 @@ namespace gtsam {
 	template<class G, class C, class L, class S, class W>
 	VectorConfig NonlinearOptimizer<G, C, L, S, W>::linearizeAndOptimizeForDelta() const {
 		boost::shared_ptr<L> linearized = solver_->linearize(*graph_, *config_);
-		return solver_->optimize(*linearized);
+		NonlinearOptimizer prepared(graph_, config_, solver_->prepareLinear(*linearized), error_, lambda_);
+		return prepared.solver_->optimize(*linearized);
 	}
 
 	/* ************************************************************************* */