diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 81143dcbc..4f1546fd6 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -269,46 +269,46 @@ var InternalClient = (function () {
 	InternalClient.prototype.joinVoiceChannel = function joinVoiceChannel(chann) {
 		var _this3 = this;
 
-		var channel = this.resolver.resolveVoiceChannel(chann);
+		return this.resolver.resolveChannel(chann).then(function (channel) {
+			if (!channel) {
+				return Promise.reject(new Error("voice channel does not exist"));
+			}
+			return _this3.leaveVoiceChannel().then(function () {
+				return new Promise(function (resolve, reject) {
+					var session,
+					    token,
+					    server = channel.server,
+					    endpoint;
 
-		if (!channel) {
-			return Promise.reject(new Error("voice channel does not exist"));
-		}
-		return this.leaveVoiceChannel().then(function () {
-			return new Promise(function (resolve, reject) {
-				var session,
-				    token,
-				    server = channel.server,
-				    endpoint;
+					var check = function check(m) {
+						var data = JSON.parse(m);
+						if (data.t === "VOICE_STATE_UPDATE") {
+							session = data.d.session_id;
+						} else if (data.t === "VOICE_SERVER_UPDATE") {
+							token = data.d.token;
+							endpoint = data.d.endpoint;
+							var chan = _this3.voiceConnection = new _VoiceVoiceConnection2["default"](channel, _this3.client, session, token, server, endpoint);
 
-				var check = function check(m) {
-					var data = JSON.parse(m);
-					if (data.t === "VOICE_STATE_UPDATE") {
-						session = data.d.session_id;
-					} else if (data.t === "VOICE_SERVER_UPDATE") {
-						token = data.d.token;
-						endpoint = data.d.endpoint;
-						var chan = _this3.voiceConnection = new _VoiceVoiceConnection2["default"](channel, _this3.client, session, token, server, endpoint);
+							chan.on("ready", function () {
+								return resolve(chan);
+							});
+							chan.on("error", reject);
 
-						chan.on("ready", function () {
-							return resolve(chan);
-						});
-						chan.on("error", reject);
+							_this3.client.emit("debug", "removed temporary voice websocket listeners");
+							_this3.websocket.removeListener("message", check);
+						}
+					};
 
-						_this3.client.emit("debug", "removed temporary voice websocket listeners");
-						_this3.websocket.removeListener("message", check);
-					}
-				};
-
-				_this3.websocket.on("message", check);
-				_this3.sendWS({
-					op: 4,
-					d: {
-						"guild_id": server.id,
-						"channel_id": channel.id,
-						"self_mute": false,
-						"self_deaf": false
-					}
+					_this3.websocket.on("message", check);
+					_this3.sendWS({
+						op: 4,
+						d: {
+							"guild_id": server.id,
+							"channel_id": channel.id,
+							"self_mute": false,
+							"self_deaf": false
+						}
+					});
 				});
 			});
 		});
diff --git a/lib/Client/Resolver/Resolver.js b/lib/Client/Resolver/Resolver.js
index 5f55ff2b6..cdd7b6c9f 100644
--- a/lib/Client/Resolver/Resolver.js
+++ b/lib/Client/Resolver/Resolver.js
@@ -236,14 +236,6 @@ var Resolver = (function () {
 		return null;
 	};
 
-	Resolver.prototype.resolveVoiceChannel = function resolveVoiceChannel(resource) {
-		// resolveChannel will also work but this is more apt
-		if (resource instanceof _StructuresVoiceChannel2["default"]) {
-			return resource;
-		}
-		return null;
-	};
-
 	Resolver.prototype.resolveChannel = function resolveChannel(resource) {
 		/*
   	accepts a Message, Channel, Server, String ID, User
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index b7737dacb..7a026d278 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -200,45 +200,45 @@ export default class InternalClient {
 
 	//def joinVoiceChannel
 	joinVoiceChannel(chann) {
-		var channel = this.resolver.resolveVoiceChannel(chann);
+		return this.resolver.resolveChannel(chann).then(channel => {
+			if (!channel) {
+				return Promise.reject(new Error("voice channel does not exist"));
+			}
+			return this.leaveVoiceChannel()
+			.then(() => {
+				return new Promise((resolve, reject) => {
+					var session, token, server = channel.server, endpoint;
 
-		if (!channel) {
-			return Promise.reject(new Error("voice channel does not exist"));
-		}
-		return this.leaveVoiceChannel()
-		.then(() => {
-			return new Promise((resolve, reject) => {
-				var session, token, server = channel.server, endpoint;
+					var check = m => {
+						var data = JSON.parse(m);
+						if (data.t === "VOICE_STATE_UPDATE") {
+							session = data.d.session_id;
+						} else if (data.t === "VOICE_SERVER_UPDATE") {
+							token = data.d.token;
+							endpoint = data.d.endpoint;
+							var chan = this.voiceConnection = new VoiceConnection(
+								channel, this.client, session, token, server, endpoint
+							);
 
-				var check = m => {
-					var data = JSON.parse(m);
-					if (data.t === "VOICE_STATE_UPDATE") {
-						session = data.d.session_id;
-					} else if (data.t === "VOICE_SERVER_UPDATE") {
-						token = data.d.token;
-						endpoint = data.d.endpoint;
-						var chan = this.voiceConnection = new VoiceConnection(
-							channel, this.client, session, token, server, endpoint
-						);
+							chan.on("ready", () => resolve(chan));
+							chan.on("error", reject);
 
-						chan.on("ready", () => resolve(chan));
-						chan.on("error", reject);
+							this.client.emit("debug", "removed temporary voice websocket listeners");
+							this.websocket.removeListener("message", check);
 
-						this.client.emit("debug", "removed temporary voice websocket listeners");
-						this.websocket.removeListener("message", check);
+						}
+					};
 
-					}
-				};
-
-				this.websocket.on("message", check);
-				this.sendWS({
-					op: 4,
-					d: {
-						"guild_id": server.id,
-						"channel_id": channel.id,
-						"self_mute": false,
-						"self_deaf": false
-					}
+					this.websocket.on("message", check);
+					this.sendWS({
+						op: 4,
+						d: {
+							"guild_id": server.id,
+							"channel_id": channel.id,
+							"self_mute": false,
+							"self_deaf": false
+						}
+					});
 				});
 			});
 		});
diff --git a/src/Client/Resolver/Resolver.js b/src/Client/Resolver/Resolver.js
index 6ea777e05..a2721f6a3 100644
--- a/src/Client/Resolver/Resolver.js
+++ b/src/Client/Resolver/Resolver.js
@@ -166,14 +166,6 @@ export default class Resolver {
 		return null;
 	}
 
-	resolveVoiceChannel(resource) {
-		// resolveChannel will also work but this is more apt
-		if (resource instanceof VoiceChannel) {
-			return resource;
-		}
-		return null;
-	}
-
 	resolveChannel(resource) {
 		/*
 			accepts a Message, Channel, Server, String ID, User