diff --git a/SolutionAssemblyInfo.cs b/SolutionAssemblyInfo.cs
index 0c060df81..dccf0426c 100644
--- a/SolutionAssemblyInfo.cs
+++ b/SolutionAssemblyInfo.cs
@@ -15,6 +15,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.2.0.*")]
-[assembly: AssemblyFileVersion("1.2.0.*")]
-[assembly: AssemblyInformationalVersion("1.2.0.*")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyInformationalVersion("1.2.0")]
\ No newline at end of file
diff --git a/Wox.Infrastructure/Logger/Log.cs b/Wox.Infrastructure/Logger/Log.cs
index acf90fbd3..f48d7196d 100644
--- a/Wox.Infrastructure/Logger/Log.cs
+++ b/Wox.Infrastructure/Logger/Log.cs
@@ -12,7 +12,7 @@ public static class Log
         static Log()
         {
             var directoryName = "Logs";
-            var path = Path.Combine(Wox.DataPath, directoryName);
+            var path = Path.Combine(Wox.DataPath, directoryName, Wox.Version);
             if (!Directory.Exists(path))
             {
                 Directory.CreateDirectory(path);
@@ -21,7 +21,7 @@ static Log()
             var configuration = new LoggingConfiguration();
             var target = new FileTarget();
             configuration.AddTarget("file", target);
-            target.FileName = "${specialfolder:folder=ApplicationData}/" + Wox.Name + "/" + directoryName + "/${shortdate}.log";
+            target.FileName = "${specialfolder:folder=ApplicationData}/" + Wox.Name + "/" + directoryName + "/" + Wox.Version + "/${shortdate}.log";
             var rule = new LoggingRule("*", LogLevel.Info, target);
             configuration.LoggingRules.Add(rule);
             LogManager.Configuration = configuration;
diff --git a/Wox/App.xaml.cs b/Wox/App.xaml.cs
index e56d8eac5..46831a980 100644
--- a/Wox/App.xaml.cs
+++ b/Wox/App.xaml.cs
@@ -63,7 +63,6 @@ private void OnStartup(object sender, StartupEventArgs e)
 
         private void OnActivated(object sender, EventArgs e)
         {
-            // todo happlebao add option in gui
             if (_settings.AutoUpdates)
             {
                 Updater.UpdateApp();
@@ -109,7 +108,7 @@ public void Dispose()
             // but if sessionending is not called, exit won't be called when log off / shutdown
             if (!_disposed)
             {
-                ((MainViewModel)Current.MainWindow?.DataContext)?.Save();
+                Current.Dispatcher.Invoke(() => ((MainViewModel) Current.MainWindow?.DataContext)?.Save());
                 _disposed = true;
             }
         }