diff --git a/src/CalcViewModel/ApplicationViewModel.cpp b/src/CalcViewModel/ApplicationViewModel.cpp
index 190e7271..c8b2153e 100644
--- a/src/CalcViewModel/ApplicationViewModel.cpp
+++ b/src/CalcViewModel/ApplicationViewModel.cpp
@@ -558,7 +558,7 @@ void ApplicationViewModel::Initialize(ViewMode mode)
 
 void ApplicationViewModel::Initialize(CalculatorApp::ViewModel::Snapshot::ApplicationSnapshot ^ snapshot)
 {
-    // TODO: restore 
+    m_CalculatorViewModel = ref new StandardCalculatorViewModel(snapshot->StandardCalculator);
     Initialize(static_cast<ViewMode>(snapshot->Mode));
 }
 
diff --git a/src/Calculator/Views/MainPage.xaml.cs b/src/Calculator/Views/MainPage.xaml.cs
index e7efa4c6..3d9cc9ea 100644
--- a/src/Calculator/Views/MainPage.xaml.cs
+++ b/src/Calculator/Views/MainPage.xaml.cs
@@ -74,7 +74,7 @@ namespace CalculatorApp
                     string embeddedData;
                     try
                     {
-                        var json = JsonSerializer.Serialize(new ApplicationSnapshotAlias { Value = Model.Snapshot });
+                        var json = JsonSerializer.Serialize(new ApplicationSnapshotAlias(Model.Snapshot));
                         embeddedData = Convert.ToBase64String(DeflateUtils.Compress(json));
                     }
                     catch (Exception)