diff --git a/src/Discord.Net/Models/User.cs b/src/Discord.Net/Models/User.cs
index e53dd7a76..c1fea7b9e 100644
--- a/src/Discord.Net/Models/User.cs
+++ b/src/Discord.Net/Models/User.cs
@@ -258,11 +258,12 @@ namespace Discord
         }
 		private void UpdateRoles(IEnumerable<Role> roles)
 		{
-			Dictionary<long, Role> newRoles;
+			Dictionary<long, Role> newRoles = new Dictionary<long, Role>();
 			if (roles != null)
-				newRoles = roles.ToDictionary(x => x.Id, x => x);
-			else
-				newRoles = new Dictionary<long, Role>();
+			{
+				foreach (var r in roles)
+					newRoles[r.Id] = r;
+			}
 
 			if (_server.Id != null)
 			{