diff --git a/apps/graph/values/values_parameter_controller.cpp b/apps/graph/values/values_parameter_controller.cpp
index ee105ffe2..4981cff77 100644
--- a/apps/graph/values/values_parameter_controller.cpp
+++ b/apps/graph/values/values_parameter_controller.cpp
@@ -24,20 +24,6 @@ View * ValuesParameterController::view() {
   return &m_listView;
 }
 
-TextListViewCell * ValuesParameterController::ListViewCellAtIndex(int index) {
-  switch(index) {
-    case 0:
-      return &m_intervalStartCell;
-    case 1:
-      return &m_intervalEndCell;
-    case 2:
-      return &m_intervalStepCell;
-    default:
-      assert(false);
-      return nullptr;
-  }
-}
-
 Graph::Interval * ValuesParameterController::interval() {
   return m_interval;
 }
@@ -130,7 +116,8 @@ void ValuesParameterController::editInterval(bool overwrite, char initialDigit)
     initialTextContent[0] = initialDigit;
     initialTextContent[1] = 0;
   } else {
-    strlcpy(initialTextContent, ListViewCellAtIndex(m_activeCell)->textContent(), sizeof(initialTextContent));
+    TextListViewCell * textListViewCell = (TextListViewCell *)reusableCell(m_activeCell);
+    strlcpy(initialTextContent, textListViewCell->textContent(), sizeof(initialTextContent));
   }
   App * myApp = (App *)app();
   InputViewController * inputController = myApp->inputViewController();
@@ -138,7 +125,7 @@ void ValuesParameterController::editInterval(bool overwrite, char initialDigit)
     [](void * context, void * sender){
     ValuesParameterController * valuesParameterController = (ValuesParameterController *)context;
     int activeCell = valuesParameterController->activeCell();
-    TextListViewCell * cell = valuesParameterController->ListViewCellAtIndex(activeCell);
+    TextListViewCell * cell = (TextListViewCell *)valuesParameterController->reusableCell(activeCell);
     InputViewController * myInputViewController = (InputViewController *)sender;
     const char * textBody = myInputViewController->textBody();
     App * myApp = (App *)valuesParameterController->app();
diff --git a/apps/graph/values/values_parameter_controller.h b/apps/graph/values/values_parameter_controller.h
index af246adb6..d02f3d10a 100644
--- a/apps/graph/values/values_parameter_controller.h
+++ b/apps/graph/values/values_parameter_controller.h
@@ -9,7 +9,6 @@ class ValuesParameterController : public ViewController, public SimpleListViewDa
 public:
   ValuesParameterController(Responder * parentResponder, Interval * interval);
   Interval * interval();
-  TextListViewCell * ListViewCellAtIndex(int index);
   int activeCell();
   void editInterval(bool overwrite, char initialDigit = 0);
   void setIntervalParameterAtIndex(int parameterIndex, float f);