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..9824db8 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;
@@ -221,6 +222,7 @@ public class EncodingStorage extends HashMap<File, EncodingStorage.Info> {
     }
 
     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() {
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);