diff --git a/apps/graph/graph/intersection_graph_controller.cpp b/apps/graph/graph/intersection_graph_controller.cpp
index caf58fcd5..a39f7c7a3 100644
--- a/apps/graph/graph/intersection_graph_controller.cpp
+++ b/apps/graph/graph/intersection_graph_controller.cpp
@@ -41,8 +41,8 @@ Poincare::Expression::Coordinate2D IntersectionGraphController::computeNewPointO
   for (int i = 0; i < functionStore()->numberOfActiveFunctions(); i++) {
     Ion::Storage::Record record = functionStore()->activeRecordAtIndex(i);
     if (record != m_record) {
-      StorageCartesianFunction * f = functionStore()->modelForRecord(record);
-      Poincare::Expression::Coordinate2D intersection = f->nextIntersectionFrom(start, step, max, context, f);
+      Poincare::Expression e = functionStore()->modelForRecord(record)->expression(context);
+      Poincare::Expression::Coordinate2D intersection = functionStore()->modelForRecord(m_record)->nextIntersectionFrom(start, step, max, context, e);
       if ((std::isnan(result.abscissa) || std::fabs(intersection.abscissa-start) < std::fabs(result.abscissa-start)) && !std::isnan(intersection.abscissa)) {
         m_intersectedRecord = record;
         result = (std::isnan(result.abscissa) || std::fabs(intersection.abscissa-start) < std::fabs(result.abscissa-start)) ? intersection : result;
diff --git a/apps/shared/storage_cartesian_function.cpp b/apps/shared/storage_cartesian_function.cpp
index fcac278d1..29adc3f5e 100644
--- a/apps/shared/storage_cartesian_function.cpp
+++ b/apps/shared/storage_cartesian_function.cpp
@@ -115,9 +115,9 @@ double StorageCartesianFunction::nextRootFrom(double start, double step, double
   return expression(context).nextRoot(unknownX, start, step, max, *context, Preferences::sharedPreferences()->angleUnit());
 }
 
-Expression::Coordinate2D StorageCartesianFunction::nextIntersectionFrom(double start, double step, double max, Poincare::Context * context, const Shared::StorageFunction * function) const {
+Expression::Coordinate2D StorageCartesianFunction::nextIntersectionFrom(double start, double step, double max, Poincare::Context * context, Expression e) const {
   const char unknownX[2] = {Poincare::Symbol::UnknownX, 0};
-  return expression(context).nextIntersection(unknownX, start, step, max, *context, Preferences::sharedPreferences()->angleUnit(), function->expression(context));
+  return expression(context).nextIntersection(unknownX, start, step, max, *context, Preferences::sharedPreferences()->angleUnit(), e);
 }
 
 StorageCartesianFunction::CartesianFunctionRecordData * StorageCartesianFunction::recordData() const {
diff --git a/apps/shared/storage_cartesian_function.h b/apps/shared/storage_cartesian_function.h
index f3d06adbe..9cd559934 100644
--- a/apps/shared/storage_cartesian_function.h
+++ b/apps/shared/storage_cartesian_function.h
@@ -22,7 +22,7 @@ public:
   Poincare::Expression::Coordinate2D nextMinimumFrom(double start, double step, double max, Poincare::Context * context) const;
   Poincare::Expression::Coordinate2D nextMaximumFrom(double start, double step, double max, Poincare::Context * context) const;
   double nextRootFrom(double start, double step, double max, Poincare::Context * context) const;
-  Poincare::Expression::Coordinate2D nextIntersectionFrom(double start, double step, double max, Poincare::Context * context, const StorageFunction * function) const;
+  Poincare::Expression::Coordinate2D nextIntersectionFrom(double start, double step, double max, Poincare::Context * context, Poincare::Expression expression) const;
 protected:
   class CartesianFunctionRecordData : public FunctionRecordData {
   public: