diff --git a/Opus/Assets/Version.txt b/Opus/Assets/Version.txt
index f90312b..8ea91a8 100644
--- a/Opus/Assets/Version.txt
+++ b/Opus/Assets/Version.txt
@@ -1,3 +1,3 @@
-Version: 3.4.9
+Version: 3.5.0
 Beta: False
-Link: https://github.com/AnonymusRaccoon/Opus/releases/download/3.4.9/Opus.v3.4.9.apk
+Link: https://github.com/AnonymusRaccoon/Opus/releases/download/3.5.0/Opus.v3.5.0.apk
diff --git a/Opus/Code/Api/PlaylistManager.cs b/Opus/Code/Api/PlaylistManager.cs
index cd7f4b5..43ff1a0 100644
--- a/Opus/Code/Api/PlaylistManager.cs
+++ b/Opus/Code/Api/PlaylistManager.cs
@@ -188,9 +188,23 @@ namespace Opus.Api
             if (tracks.Count == 0)
                 return;
 
-            tracks.RemoveAt(playPos);
-            tracks = tracks.OrderBy(x => r.Next()).ToList();
-            MusicPlayer.instance.AddToQueue(tracks);
+            if (tracks.Count >= playPos)
+            {
+                tracks.RemoveAt(playPos);
+                tracks = tracks.OrderBy(x => r.Next()).ToList();
+                MusicPlayer.instance.AddToQueue(tracks);
+            }
+            else
+            {
+                playPos = r.Next(tracks.Count);
+                MusicPlayer.currentID = -1;
+                SongManager.Play(tracks[playPos]);
+
+                tracks.RemoveAt(playPos);
+                tracks = tracks.OrderBy(x => r.Next()).ToList();
+                MusicPlayer.instance.AddToQueue(tracks);
+            }
+            
         }
         #endregion
 
diff --git a/Opus/Properties/AndroidManifest.xml b/Opus/Properties/AndroidManifest.xml
index 37e09f6..170101d 100644
--- a/Opus/Properties/AndroidManifest.xml
+++ b/Opus/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.sdg.opus" android:installLocation="preferExternal" android:versionName="3.4.9" android:versionCode="54">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.sdg.opus" android:installLocation="preferExternal" android:versionName="3.5.0" android:versionCode="55">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />