diff --git a/src/client/voice/dispatcher/StreamDispatcher.js b/src/client/voice/dispatcher/StreamDispatcher.js
index 49c883b7a..64c393d98 100644
--- a/src/client/voice/dispatcher/StreamDispatcher.js
+++ b/src/client/voice/dispatcher/StreamDispatcher.js
@@ -215,7 +215,7 @@ class StreamDispatcher extends EventEmitter {
       buffer = this.applyVolume(buffer);
 
       data.count++;
-      data.sequence = (data.sequence + 1) < 65536 ? data.sequence + 1 : 0;
+      data.sequence = data.sequence < 65535 ? data.sequence + 1 : 0;
       data.timestamp = data.timestamp + 4294967295 ? data.timestamp + 960 : 0;
       this.sendBuffer(buffer, data.sequence, data.timestamp);
 
@@ -231,6 +231,7 @@ class StreamDispatcher extends EventEmitter {
     this.destroyed = true;
     this.setSpeaking(false);
     this.emit(type, reason);
+    if (type !== 'end') this.emit('end', `destroyed due to ${type} - ${reason}`);
   }
 
   startStreaming() {
diff --git a/test/voice.js b/test/voice.js
new file mode 100644
index 000000000..c7d3b04d6
--- /dev/null
+++ b/test/voice.js
@@ -0,0 +1,60 @@
+/* eslint no-console: 0 */
+'use strict';
+
+const Discord = require('../');
+const ytdl = require('ytdl-core');
+
+const client = new Discord.Client({ fetchAllMembers: false, apiRequestMethod: 'sequential' });
+
+const auth = require('./auth.json');
+
+client.login(auth.token).then(() => console.log('logged')).catch(console.error);
+
+const connections = new Map();
+
+client.on('message', m => {
+  if (!m.guild) return;
+  if (m.content.startsWith('/join')) {
+    const channel = m.guild.channels.get(m.content.split(' ')[1]) || m.member.voiceChannel;
+    if (channel && channel.type === 'voice') {
+      channel.join().then(conn => {
+        conn.player.on('error', (...e) => console.log('player', ...e));
+        if (!connections.has(m.guild.id)) connections.set(m.guild.id, { conn, queue: [] });
+        m.reply('ok!');
+      });
+    } else {
+      m.reply('Specify a voice channel!');
+    }
+  } else if (m.content.startsWith('/play')) {
+    if (connections.has(m.guild.id)) {
+      const connData = connections.get(m.guild.id);
+      const queue = connData.queue;
+      const url = m.content.split(' ').slice(1).join(' ')
+        .replace(/</g, '')
+        .replace(/>/g, '');
+      queue.push({ url, m });
+      if (queue.length > 1) {
+        m.reply(`OK, that's going to play after ${queue.length - 1} songs`);
+        return;
+      }
+      doQueue(connData);
+    }
+  }
+});
+
+function doQueue(connData) {
+  const conn = connData.conn;
+  const queue = connData.queue;
+  const item = queue[0];
+  if (!item) return;
+  const stream = ytdl(item.url, { filter: 'audioonly' }, { passes: 3 });
+  const dispatcher = conn.playStream(stream);
+  stream.on('info', info => {
+    item.m.reply(`OK, playing **${info.title}**`);
+  });
+  dispatcher.on('end', () => {
+    queue.shift();
+    doQueue(connData);
+  });
+  dispatcher.on('error', (...e) => console.log('dispatcher', ...e));
+}