diff --git a/apps/probability/app.h b/apps/probability/app.h
index 12d1f3bdf..61f0a4b0d 100644
--- a/apps/probability/app.h
+++ b/apps/probability/app.h
@@ -54,6 +54,7 @@ public:
     char m_calculation[k_calculationSize];
     Page m_activePage;
   };
+  Snapshot * snapshot() const { return static_cast<Snapshot *>(::App::snapshot()); }
 private:
   App(Snapshot * snapshot);
   CalculationController m_calculationController;
diff --git a/apps/probability/calculation_controller.cpp b/apps/probability/calculation_controller.cpp
index 007f938ab..f9dcdea43 100644
--- a/apps/probability/calculation_controller.cpp
+++ b/apps/probability/calculation_controller.cpp
@@ -79,8 +79,7 @@ CalculationController::CalculationController(Responder * parentResponder, InputE
 }
 
 void CalculationController::didEnterResponderChain(Responder * previousResponder) {
-  App::Snapshot * snapshot = (App::Snapshot *)app()->snapshot();
-  snapshot->setActivePage(App::Snapshot::Page::Calculations);
+  app()->snapshot()->setActivePage(App::Snapshot::Page::Calculations);
   updateTitle();
   reloadLawCurveView();
   m_selectableTableView.reloadData();
diff --git a/apps/probability/law_controller.cpp b/apps/probability/law_controller.cpp
index b507bb8a9..60e5eb596 100644
--- a/apps/probability/law_controller.cpp
+++ b/apps/probability/law_controller.cpp
@@ -73,8 +73,7 @@ void Probability::LawController::viewWillAppear() {
 }
 
 void Probability::LawController::didBecomeFirstResponder() {
-  App::Snapshot * snapshot = (App::Snapshot *)app()->snapshot();
-  snapshot->setActivePage(App::Snapshot::Page::Law);
+  app()->snapshot()->setActivePage(App::Snapshot::Page::Law);
   if (selectedRow() == -1) {
     selectCellAtLocation(0, 0);
   } else {
diff --git a/apps/probability/parameters_controller.cpp b/apps/probability/parameters_controller.cpp
index def7ab459..d6bb367d2 100644
--- a/apps/probability/parameters_controller.cpp
+++ b/apps/probability/parameters_controller.cpp
@@ -99,8 +99,7 @@ void ParametersController::reinitCalculation() {
 }
 
 void ParametersController::didBecomeFirstResponder() {
-  App::Snapshot * snapshot = (App::Snapshot *)app()->snapshot();
-  snapshot->setActivePage(App::Snapshot::Page::Parameters);
+  app()->snapshot()->setActivePage(App::Snapshot::Page::Parameters);
   FloatParameterController::didBecomeFirstResponder();
 }