diff --git a/lib/Voice/VoiceConnection.js b/lib/Voice/VoiceConnection.js
index 03885a07e..fb4644e2f 100644
--- a/lib/Voice/VoiceConnection.js
+++ b/lib/Voice/VoiceConnection.js
@@ -56,7 +56,7 @@ var VoiceConnection = (function (_EventEmitter) {
 		this.session = session;
 		this.token = token;
 		this.server = server;
-		this.endpoint = endpoint.replace(":80", "");
+		this.endpoint = endpoint.split(":")[0];
 		this.vWS = null; // vWS means voice websocket
 		this.ready = false;
 		this.vWSData = {};
@@ -67,6 +67,8 @@ var VoiceConnection = (function (_EventEmitter) {
 		this.streamTime = 0;
 		this.streamProc = null;
 		this.KAI = null;
+		this.timestamp = 0;
+		this.sequence = 0;
 		this.init();
 	}
 
@@ -108,8 +110,6 @@ var VoiceConnection = (function (_EventEmitter) {
 		var self = this;
 
 		var startTime = Date.now();
-		var sequence = 0;
-		var time = 0;
 		var count = 0;
 
 		var length = 20;
@@ -153,10 +153,10 @@ var VoiceConnection = (function (_EventEmitter) {
 				}
 
 				count++;
-				sequence + 10 < 65535 ? sequence += 1 : sequence = 0;
-				time + 9600 < 4294967295 ? time += 960 : time = 0;
+				self.sequence + 1 < 65535 ? self.sequence += 1 : self.sequence = 0;
+				self.timestamp + 960 < 4294967295 ? self.timestamp += 960 : self.timestamp = 0;
 
-				self.sendBuffer(buffer, sequence, time, function (e) {});
+				self.sendBuffer(buffer, self.sequence, self.timestamp, function (e) {});
 
 				var nextTime = startTime + count * length;
 
diff --git a/src/Voice/VoiceConnection.js b/src/Voice/VoiceConnection.js
index b3d8d2f40..4676db354 100644
--- a/src/Voice/VoiceConnection.js
+++ b/src/Voice/VoiceConnection.js
@@ -24,7 +24,7 @@ export default class VoiceConnection extends EventEmitter {
 		this.session = session;
 		this.token = token;
 		this.server = server;
-		this.endpoint = endpoint.replace(":80", "");
+		this.endpoint = endpoint.split(":")[0];
 		this.vWS = null; // vWS means voice websocket
 		this.ready = false;
 		this.vWSData = {};
@@ -35,6 +35,8 @@ export default class VoiceConnection extends EventEmitter {
 		this.streamTime = 0;
 		this.streamProc = null;
 		this.KAI = null;
+		this.timestamp = 0;
+		this.sequence = 0;
 		this.init();
 	}
 
@@ -78,8 +80,6 @@ export default class VoiceConnection extends EventEmitter {
 		var self = this;
 
 		var startTime = Date.now();
-		var sequence = 0;
-		var time = 0;
 		var count = 0;
 
 		var length = 20;
@@ -123,10 +123,10 @@ export default class VoiceConnection extends EventEmitter {
 					 }
 
 				count++;
-				sequence + 10 < 65535 ? sequence += 1 : sequence = 0;
-				time + 9600 < 4294967295 ? time += 960 : time = 0;
+				self.sequence + 1 < 65535 ? self.sequence += 1 : self.sequence = 0;
+				self.timestamp + 960 < 4294967295 ? self.timestamp += 960 : self.timestamp = 0;
 
-				self.sendBuffer(buffer, sequence, time, (e) => { });
+				self.sendBuffer(buffer, self.sequence, self.timestamp, (e) => { });
 
 				var nextTime = startTime + (count * length);