diff --git a/app/build.gradle b/app/build.gradle
index 9c10cad..822a1c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.github.axet.audiorecorder"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 15
-        versionName "1.0.14"
+        versionCode 16
+        versionName "1.0.15"
     }
     signingConfigs {
         release {
diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
index 18c0576..65fbf7e 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
@@ -56,8 +56,6 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
 
     final int[] ALL = {TYPE_COLLAPSED, TYPE_EXPANDED};
 
-    int selected = -1;
-
     int scrollState;
 
     Recordings recordings;
@@ -81,6 +79,7 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
         MediaPlayer player;
         Runnable updatePlayer;
         PopupShareActionProvider shareProvider;
+        int selected = -1;
 
         Map<File, Integer> duration = new TreeMap<>();
 
@@ -177,7 +176,7 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
                                 public void run() {
                                     f.delete();
                                     view.setTag(TYPE_DELETED);
-                                    selected = -1;
+                                    select(-1);
                                     load();
                                 }
                             });
@@ -245,7 +244,7 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
                     @Override
                     public void onClick(View v) {
                         playerStop();
-                        selected = -1;
+                        select(-1);
                         notifyDataSetChanged();
                     }
                 });
@@ -256,7 +255,7 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
                 convertView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        selected = position;
+                        select(position);
                         notifyDataSetChanged();
 
                         playerStop();
@@ -376,6 +375,12 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
 
             return playing;
         }
+
+        public void select(int pos) {
+            selected = pos;
+            notifyDataSetChanged();
+            playerStop();
+        }
     }
 
     @Override
@@ -468,8 +473,7 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
             handler.post(new Runnable() {
                 @Override
                 public void run() {
-                    MainActivity.this.selected = selected;
-                    recordings.notifyDataSetChanged();
+                    recordings.select(selected);
                 }
             });
         }
@@ -544,7 +548,7 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
         handler.post(new Runnable() {
             @Override
             public void run() {
-                list.smoothScrollToPosition(selected);
+                list.smoothScrollToPosition(recordings.selected);
             }
         });
     }
diff --git a/app/src/main/java/com/github/axet/audiorecorder/encoders/MuxerMP4.java b/app/src/main/java/com/github/axet/audiorecorder/encoders/MuxerMP4.java
index bde8dc0..191d1da 100755
--- a/app/src/main/java/com/github/axet/audiorecorder/encoders/MuxerMP4.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/encoders/MuxerMP4.java
@@ -53,7 +53,8 @@ public class MuxerMP4 implements Encoder {
 
             int bytes = len * 2;
 
-            encoder.queueInputBuffer(inputIndex, 0, bytes, getCurrentTimeStamp(), 0);
+            long ts = getCurrentTimeStamp();
+            encoder.queueInputBuffer(inputIndex, 0, bytes, ts, 0);
             NumSamples += len / info.channels;
             offset += len;