diff --git a/PushSharp.WindowsPhone/WindowsPhoneNotification.cs b/PushSharp.WindowsPhone/WindowsPhoneNotification.cs
index 6f871462..1f823103 100644
--- a/PushSharp.WindowsPhone/WindowsPhoneNotification.cs
+++ b/PushSharp.WindowsPhone/WindowsPhoneNotification.cs
@@ -136,13 +136,13 @@ public override string PayloadToString()
 						sb.Append("?");
 
 						foreach (string key in Parameters.Keys)
-							sb.Append(XmlEncode(key + "=" + Parameters[key].ToString()) + "&");
+							sb.Append(XmlEncode(key + "=" + Parameters[key].ToString()) + "&");
 					}
 
 					var paramValue = sb.ToString();
 
-					if (!string.IsNullOrEmpty(paramValue) && paramValue.EndsWith("&"))
-						paramValue.Substring(0, paramValue.Length - "&".Length);
+					if (!string.IsNullOrEmpty(paramValue) && paramValue.EndsWith("&"))
+						paramValue.Substring(0, paramValue.Length - 1);
 
 					if (!string.IsNullOrEmpty(paramValue))
 						toast.Add(new XElement(wp + "Param", paramValue));