diff --git a/app/build.gradle b/app/build.gradle
index ec9d320..a9d8c0a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.github.axet.audiorecorder"
         minSdkVersion 9
         targetSdkVersion 28
-        versionCode          345
-        versionName          "3.3.20"
+        versionCode           346
+        versionName           "3.3.21"
     }
     signingConfigs {
         release {
diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
index 9a3c338..bfb40e4 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
@@ -350,7 +350,7 @@ public class RecordingActivity extends AppCompatThemeActivity {
                     d.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
-                            EncodingService.saveAsWAV(RecordingActivity.this, recording.storage.getTempRecording(), recording.storage.getNewFile(d.getCurrentPath(), FormatWAV.EXT), recording.getInfo());
+                            EncodingService.saveAsWAV(RecordingActivity.this, recording.storage.getTempRecording(), d.getCurrentPath(), recording.getInfo());
                         }
                     });
                     d.show();
diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java b/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java
index 6d8f34a..e958b62 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/app/EncodingStorage.java
@@ -10,6 +10,7 @@ import android.util.Xml;
 
 import com.github.axet.audiolibrary.app.RawSamples;
 import com.github.axet.audiolibrary.encoders.FileEncoder;
+import com.github.axet.audiolibrary.encoders.FormatWAV;
 import com.github.axet.audiolibrary.encoders.OnFlyEncoding;
 import com.github.axet.audiolibrary.filters.AmplifierFilter;
 import com.github.axet.audiolibrary.filters.SkipSilenceFilter;
@@ -86,11 +87,11 @@ public class EncodingStorage extends HashMap<File, EncodingStorage.Info> {
         File storage = this.storage.getTempRecording().getParentFile();
         File[] ff = storage.listFiles(new FilenameFilter() {
             String start = Storage.getNameNoExt(Storage.TMP_ENC);
-            String ext = Storage.getExt(Storage.TMP_ENC);
+            String ext = "." + Storage.getExt(Storage.TMP_ENC);
 
             @Override
             public boolean accept(File dir, String name) {
-                return name.startsWith(start) && name.endsWith("." + ext);
+                return name.startsWith(start) && name.endsWith(ext);
             }
         });
         if (ff == null)
@@ -144,9 +145,7 @@ public class EncodingStorage extends HashMap<File, EncodingStorage.Info> {
             encoding(encoder, fly, info.info, new Runnable() {
                 @Override
                 public void run() {
-                    encoder.close();
-                    encoder = null;
-                    startEncoding();
+                    restart();
                 }
             });
             return;
@@ -183,6 +182,7 @@ public class EncodingStorage extends HashMap<File, EncodingStorage.Info> {
             public void run() { // success
                 Storage.delete(encoder.in); // delete raw recording
                 Storage.delete(EncodingStorage.jsonFile(encoder.in)); // delete json file
+                remove(encoder.in);
                 Post(DONE, new Intent()
                         .putExtra("targetUri", fly.targetUri)
                 );
@@ -213,26 +213,31 @@ public class EncodingStorage extends HashMap<File, EncodingStorage.Info> {
         encoding(encoder, fly, info, new Runnable() {
             @Override
             public void run() {
-                encoder.close();
-                encoder = null;
-                Post(EXIT, null);
+                exit();
             }
         });
     }
 
     public void saveAsWAV(File in, File out, RawSamples.Info info) {
+        out = storage.getNewFile(out, FormatWAV.EXT);
         OnFlyEncoding fly = new OnFlyEncoding(storage, out, info);
         encoder = new FileEncoder(storage.getContext(), in, fly);
         encoding(encoder, fly, info, new Runnable() {
             @Override
             public void run() {
-                encoder.close();
-                encoder = null;
-                Post(EXIT, null);
+                exit();
             }
         });
     }
 
+    public void exit() {
+        if (encoder != null) {
+            encoder.close();
+            encoder = null;
+        }
+        Post(EXIT, null);
+    }
+
     public void restart() {
         if (encoder != null) {
             encoder.close();
diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/EncodingService.java b/app/src/main/java/com/github/axet/audiorecorder/services/EncodingService.java
index 86906de..aa41a6e 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/services/EncodingService.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/services/EncodingService.java
@@ -209,8 +209,7 @@ public class EncodingService extends PersistentService {
         } else if (a.equals(SAVE_AS_WAV)) {
             try {
                 File in = (File) intent.getSerializableExtra("in");
-                File out = (File) intent.getSerializableExtra("out"); // dir
-                out = storage.getNewFile(out, FormatWAV.EXT);
+                File out = (File) intent.getSerializableExtra("out");
                 RawSamples.Info info = new RawSamples.Info(intent.getStringExtra("info"));
                 if (encodings.encoder == null)
                     encodings.saveAsWAV(in, out, info);