diff --git a/Translator/MainWindow.xaml.cs b/Translator/MainWindow.xaml.cs
index 708defa..0646606 100644
--- a/Translator/MainWindow.xaml.cs
+++ b/Translator/MainWindow.xaml.cs
@@ -216,6 +216,7 @@ private void DownloaderWorker_RunWorkerCompleted(object sender, RunWorkerComplet
             WorkerFinished = true;
             DownloadProgress = DownloadCount;
             TaskbarItemInfo.ProgressValue = 1.0;
+            WordsListView.Focus();
             //TaskbarItemInfo.ProgressState = TaskbarItemProgressState.None;
 
         }
@@ -242,7 +243,6 @@ public static BitmapImage LoadImage(string fileName)
 
         private void DownloaderWorker_DoWork(object sender, DoWorkEventArgs e)
         {
-            int i = 0;
             try
             {
                 foreach (var item in PhraseItems)
@@ -258,6 +258,7 @@ private void DownloaderWorker_DoWork(object sender, DoWorkEventArgs e)
                         }
                         else
                         {
+                            e.Result = true;
                             break;
                         }
                     }
@@ -267,7 +268,7 @@ private void DownloaderWorker_DoWork(object sender, DoWorkEventArgs e)
             {
                 MessageBox.Show("Couldn't download audio\r\n\r\n" + Ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
-            while (PhraseItems.Count(n => n.DownloadComplete) < PhraseItems.Count)
+            while (PhraseItems.Count(n => n.DownloadComplete) < PhraseItems.Count(n=> !String.IsNullOrEmpty(n.Phrase)))
             {
                 if (!DownloaderWorker.CancellationPending)
                 {
diff --git a/Translator/Properties/AssemblyInfo.cs b/Translator/Properties/AssemblyInfo.cs
index 40b0291..beefc25 100644
--- a/Translator/Properties/AssemblyInfo.cs
+++ b/Translator/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.0.1")]
+[assembly: AssemblyFileVersion("2.1.0.1")]
diff --git a/Translator/TTSProvider/MicrosoftTTSProvider.cs b/Translator/TTSProvider/MicrosoftTTSProvider.cs
index ced23f4..84dced9 100644
--- a/Translator/TTSProvider/MicrosoftTTSProvider.cs
+++ b/Translator/TTSProvider/MicrosoftTTSProvider.cs
@@ -82,10 +82,12 @@ public override void DownloadItem(PhraseItem item, string folder, Boolean? conve
                         ms.Seek(0, SeekOrigin.Begin);
                         using (WaveFileReader wav = new WaveFileReader(ms))// String.Format("{0}\\wav22050\\{1}\\{2}.wav", folder, item.Folder, item.FileName)))
                         {
-                            FileStream fs = new FileStream(String.Format("{0}\\mp3\\{1}\\{2}.mp3", folder, item.Folder, item.FileName), FileMode.Create);
-                            using (var writer = new LameMP3FileWriter(fs, wav.WaveFormat, 128))
+                            using (FileStream fs = new FileStream(String.Format("{0}\\mp3\\{1}\\{2}.mp3", folder, item.Folder, item.FileName), FileMode.Create))
                             {
-                                wav.CopyTo(writer);
+                                using (var writer = new LameMP3FileWriter(fs, wav.WaveFormat, 128))
+                                {
+                                    wav.CopyTo(writer);
+                                }
                             }
                         }
                         ms.Seek(0, SeekOrigin.Begin);