diff --git a/samples/TestApplicationShared/MainWindow.cs b/samples/TestApplicationShared/MainWindow.cs
index e702b6f4a5..4c27018c6f 100644
--- a/samples/TestApplicationShared/MainWindow.cs
+++ b/samples/TestApplicationShared/MainWindow.cs
@@ -358,7 +358,7 @@ namespace TestApplication
 
         static Stream GetImage(string path)
         {
-            return PerspexLocator.Current.GetService<IAssetLoader>().Open(new Uri("res:///" + RootNamespace + "." + path));
+            return PerspexLocator.Current.GetService<IAssetLoader>().Open(new Uri("resm:" + RootNamespace + "." + path));
         }
 
         private static TabItem ListsTab()
diff --git a/src/Shared/PlatformSupport/AssetLoader.cs b/src/Shared/PlatformSupport/AssetLoader.cs
index 48378dfe31..a954bd0022 100644
--- a/src/Shared/PlatformSupport/AssetLoader.cs
+++ b/src/Shared/PlatformSupport/AssetLoader.cs
@@ -87,7 +87,7 @@ namespace Perspex.Shared.PlatformSupport
             if (!uri.IsAbsoluteUri || uri.Scheme == "resm")
             {
                 var qs = uri.Query.TrimStart('?')
-                    .Split('&')
+                    .Split(new[] {'&'}, StringSplitOptions.RemoveEmptyEntries)
                     .Select(p => p.Split('='))
                     .ToDictionary(p => p[0], p => p[1]);
                 //TODO: Replace _defaultAssembly by current one (need support from OmniXAML)