diff --git a/PomoTime/MainPage.xaml.cs b/PomoTime/MainPage.xaml.cs
index 94eec26..b0dc164 100644
--- a/PomoTime/MainPage.xaml.cs
+++ b/PomoTime/MainPage.xaml.cs
@@ -117,7 +117,6 @@ namespace PomoTime
             {
                 MainViewRunningState.SecondsLeft--;
             }
-            SaveLocalState();
         }
         void TimerTick()
         {
@@ -126,6 +125,7 @@ namespace PomoTime
                 return;
             }
             PlusSecond();
+            SaveLocalState();
         }
 
         void SchedulePeriodOverNotification()
@@ -320,7 +320,7 @@ namespace PomoTime
                 return;
             }
 
-            MainViewRunningState.SecondsLeft -= TimeFromSuspend.Seconds;
+            MainViewRunningState.SecondsLeft -= (int) TimeFromSuspend.TotalSeconds;
         }
 
         private void OnResuming(object sender, Object e)
@@ -357,16 +357,19 @@ namespace PomoTime
         {
             StopTimer();
             StartTimer();
+            SaveLocalState();
         }
 
         private void MainPageLoaded(object sender, RoutedEventArgs e)
         {
             StartTimer();
+            SaveLocalState();
         }
 
         private void MainPageUnloaded(object sender, RoutedEventArgs e)
         {
             StopTimer();
+            SaveLocalState();
         }
 
         private void LoadRunningState()
diff --git a/PomoTime/Package.appxmanifest b/PomoTime/Package.appxmanifest
index ad45e3b..1242fc3 100644
--- a/PomoTime/Package.appxmanifest
+++ b/PomoTime/Package.appxmanifest
@@ -9,9 +9,9 @@
   <Identity
     Name="44844StepanUsatyuk.PomoTime"
     Publisher="CN=D7EE55C2-4D4B-40F8-8EE5-CC4CEBCE2133"
-    Version="1.0.16.0" />
+    Version="1.0.18.0" />
 
-  <mp:PhoneIdentity PhoneProductId="b38f1a32-0283-4bff-847e-df5c6d8a14bf" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="cf98db48-a912-4b11-83d2-d7b7a5aa729d" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>PomoTime</DisplayName>
diff --git a/PomoTime/PomoTime.csproj b/PomoTime/PomoTime.csproj
index 0209f0c..e0fd887 100644
--- a/PomoTime/PomoTime.csproj
+++ b/PomoTime/PomoTime.csproj
@@ -18,7 +18,7 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-    <PackageCertificateThumbprint>1EF6A398AD076B784FDB82C12377E1807142B1CF</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>B101A95DAAB5D398F1D73D36B83A990ACDFDAA4D</PackageCertificateThumbprint>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>