diff --git a/Opus/Code/UI/Fragments/Queue.cs b/Opus/Code/UI/Fragments/Queue.cs
index d6710e4..d5a3457 100644
--- a/Opus/Code/UI/Fragments/Queue.cs
+++ b/Opus/Code/UI/Fragments/Queue.cs
@@ -109,7 +109,7 @@ public class Queue : Fragment, RecyclerView.IOnItemTouchListener, PopupMenu.IOnM
         int last = ((LinearLayoutManager)ListView.GetLayoutManager()).FindLastVisibleItemPosition();
         for (int i = first; i <= last; i++)
         {
-            if(i > 0 && MusicPlayer.queue.Count > i)
+            if(i > 0 && MusicPlayer.queue.Count > i - 1)
             {
                 Song song = MusicPlayer.queue[i - 1];
                 SongHolder holder = (SongHolder)ListView.GetChildViewHolder(((LinearLayoutManager)ListView.GetLayoutManager()).FindViewByPosition(i));
diff --git a/Opus/Opus.csproj b/Opus/Opus.csproj
index bf3b0f6..f0caeda 100644
--- a/Opus/Opus.csproj
+++ b/Opus/Opus.csproj
@@ -37,7 +37,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <AotAssemblies>false</AotAssemblies>