diff --git a/apps/graph/app.h b/apps/graph/app.h
index d8be35f5b..eda5de0de 100644
--- a/apps/graph/app.h
+++ b/apps/graph/app.h
@@ -45,7 +45,7 @@ public:
   bool XNTCanBeOverriden() const override { return false; }
   CodePoint XNT() override;
   NestedMenuController * variableBoxForInputEventHandler(InputEventHandler * textInput) override;
-  CartesianFunctionStore * functionStore() override { return static_cast<CartesianFunctionStore *>(Shared::FunctionApp::functionStore()); }
+  CartesianFunctionStore * functionStore() override { return snapshot()->functionStore(); }
   Shared::Interval * intervalForType(Shared::CartesianFunction::PlotType plotType) {
     return snapshot()->intervalForType(plotType);
   }
diff --git a/apps/sequence/app.h b/apps/sequence/app.h
index b1b9f108e..0ec8334f7 100644
--- a/apps/sequence/app.h
+++ b/apps/sequence/app.h
@@ -46,7 +46,7 @@ public:
   // NestedMenuController * variableBoxForInputEventHandler(InputEventHandler * textInput) override;
   CodePoint XNT() override { return 'n'; }
   SequenceContext * localContext() override;
-  SequenceStore * functionStore() override { return static_cast<SequenceStore *>(Shared::FunctionApp::functionStore()); }
+  SequenceStore * functionStore() override { return snapshot()->functionStore(); }
   Shared::Interval * interval() { return snapshot()->interval(); }
   ValuesController * valuesController() override {
     return &m_valuesController;