diff --git a/lib/Client/Resolver/Resolver.js b/lib/Client/Resolver/Resolver.js
index c1431b23d..5c5c9baee 100644
--- a/lib/Client/Resolver/Resolver.js
+++ b/lib/Client/Resolver/Resolver.js
@@ -208,9 +208,27 @@ var Resolver = (function () {
 		}
 		if (resource instanceof _StructuresUser2["default"]) {
 			// see if a PM exists
-			var chatFound = this.internal.private_channels.find(function (pmchat) {
-				return pmchat.recipient.equals(resource);
-			});
+			var chatFound = false;
+			for (var _iterator2 = this.internal.private_channels, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+				var _ref2;
+
+				if (_isArray2) {
+					if (_i2 >= _iterator2.length) break;
+					_ref2 = _iterator2[_i2++];
+				} else {
+					_i2 = _iterator2.next();
+					if (_i2.done) break;
+					_ref2 = _i2.value;
+				}
+
+				var pmchat = _ref2;
+
+				if (pmchat.recipient.equals(resource)) {
+					chatFound = pmchat;
+					break;
+				}
+			}
+
 			if (chatFound) {
 				// a PM already exists!
 				return Promise.resolve(chatFound);
diff --git a/lib/Util/Cache.js b/lib/Util/Cache.js
index 8374938e7..184d498e8 100644
--- a/lib/Util/Cache.js
+++ b/lib/Util/Cache.js
@@ -77,7 +77,11 @@ var Cache = (function (_Array) {
 
 		if (item) {
 			var index = this.indexOf(item);
-			Object.assign(this[index], data);
+			for (var dataIndex in data) {
+				if (data.hasOwnProperty(dataIndex)) {
+					this[index][dataIndex] = data[dataIndex];
+				}
+			}
 			this[discrimCacheS][data[this[discrimS]]] = this[index];
 			return this[index];
 		} else {