diff --git a/CHANGELOG.md b/CHANGELOG.md
index f49a465..4a9f6a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### [0.8.1](https://github.com/jmeas/backbone.radio/releases/tag/v0.8.1)
+
+- **Bug fix**: Fixes bug where `stopComplying` and `stopReplying` would not remove the correct
+  callbacks in certain situations
+
 ### [0.8.0](https://github.com/jmeas/backbone.radio/releases/tag/v0.8.0)
 
 - **Feature**: DEBUG now warns when an already-registered Command or Request is overwritten
diff --git a/bower.json b/bower.json
index a85bc42..1b01f8d 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "backbone.radio",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "homepage": "https://github.com/marionettejs/backbone.radio",
   "authors": [
     "Jmeas <jellyes2@gmail.com>"
diff --git a/build/backbone.radio.js b/build/backbone.radio.js
index 77a0613..03092e5 100644
--- a/build/backbone.radio.js
+++ b/build/backbone.radio.js
@@ -1,4 +1,4 @@
-// Backbone.Radio v0.8.0
+// Backbone.Radio v0.8.1
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     define(['backbone', 'underscore'], function(Backbone, _) {
@@ -20,7 +20,7 @@
   
   var Radio = Backbone.Radio = {};
   
-  Radio.VERSION = '0.8.0';
+  Radio.VERSION = '0.8.1';
   
   // This allows you to run multiple instances of Radio on the same
   // webapp. After loading the new version, call `noConflict()` to
@@ -95,9 +95,8 @@
   function removeHandler(store, name, callback, context) {
     var event = store[name];
     if (
-      (!callback && !context) ||
-      callback && (callback === event.callback || callback === event.callback._callback) ||
-      context && context === event.context
+       (!callback || (callback === event.callback || callback === event.callback._callback)) &&
+       (!context || (context === event.context))
     ) {
       delete store[name];
       return true;
diff --git a/build/backbone.radio.min.js b/build/backbone.radio.min.js
index 459c8d5..520c84e 100644
--- a/build/backbone.radio.min.js
+++ b/build/backbone.radio.min.js
@@ -1,4 +1,4 @@
-// Backbone.Radio v0.8.0
+// Backbone.Radio v0.8.1
 
-!function(a,b){if("function"==typeof define&&define.amd)define(["backbone","underscore"],function(a,c){return b(a,c)});else if("undefined"!=typeof exports){var c=require("backbone"),d=require("underscore");module.exports=b(c,d)}else b(a.Backbone,a._)}(this,function(a,b){"use strict";function c(a,b,c){if(k.DEBUG){var d=c?" on the "+c+" channel":"";console.warn(a+d+': "'+b+'"')}}function d(a,b,c,d){if(!c)return!1;var e=[];if("object"==typeof c){for(var f in c)e.push(a[b].apply(a,[f,c[f]].concat(d)));return e}if(l.test(c)){for(var g=c.split(l),h=0,i=g.length;i>h;h++)e.push(a[b].apply(a,[g[h]].concat(d)));return e}return!1}function e(a,b,c){var d=c[0],e=c[1],f=c[2];switch(c.length){case 0:return a.call(b);case 1:return a.call(b,d);case 2:return a.call(b,d,e);case 3:return a.call(b,d,e,f);default:return a.apply(b,c)}}function f(a,b,c,d){var e=a[b];return!c&&!d||c&&(c===e.callback||c===e.callback._callback)||d&&d===e.context?(delete a[b],!0):void 0}function g(a,c,d,e){a||(a={});for(var g=c?[c]:b.keys(a),h=!1,i=0,j=g.length;j>i;i++)c=g[i],a[c]&&f(a,c,d,e)&&(h=!0);return h}function h(a){return m[a]||(m[a]=b.partial(k.log,a))}function i(a){return b.isFunction(a)?a:b.constant(a)}var j=a.Radio,k=a.Radio={};k.VERSION="0.8.0",k.noConflict=function(){return a.Radio=j,this},k.DEBUG=!1;var l=/\s+/,m={};b.extend(k,{log:function(a,c){var d=b.rest(arguments,2);console.log("["+a+'] "'+c+'"',d)},tuneIn:function(a){var b=k.channel(a);return b._tunedIn=!0,b.on("all",h(a)),this},tuneOut:function(a){var b=k.channel(a);return b._tunedIn=!1,b.off("all",h(a)),delete m[a],this}}),k.Commands={command:function(a){var f=b.rest(arguments);if(d(this,"command",a,f))return this;var g=this.channelName,h=this._commands;if(g&&this._tunedIn&&k.log.apply(this,[g,a].concat(f)),h&&(h[a]||h["default"])){var i=h[a]||h["default"];f=h[a]?f:arguments,e(i.callback,i.context,f)}else c("An unhandled command was fired",a,g);return this},comply:function(a,b,e){return d(this,"comply",a,[b,e])?this:(this._commands||(this._commands={}),this._commands[a]&&c("A command was overwritten",a,this.channelName),this._commands[a]={callback:b,context:e||this},this)},complyOnce:function(a,c,e){if(d(this,"complyOnce",a,[c,e]))return this;var f=this,g=b.once(function(){return f.stopComplying(a),c.apply(this,arguments)});return this.comply(a,g,e)},stopComplying:function(a,b,e){return d(this,"stopComplying",a)?this:(a||b||e?g(this._commands,a,b,e)||c("Attempted to remove the unregistered command",a,this.channelName):delete this._commands,this)}},k.Requests={request:function(a){var f=b.rest(arguments),g=d(this,"request",a,f);if(g)return g;var h=this.channelName,i=this._requests;if(h&&this._tunedIn&&k.log.apply(this,[h,a].concat(f)),i&&(i[a]||i["default"])){var j=i[a]||i["default"];return f=i[a]?f:arguments,e(j.callback,j.context,f)}c("An unhandled request was fired",a,h)},reply:function(a,b,e){return d(this,"reply",a,[b,e])?this:(this._requests||(this._requests={}),this._requests[a]&&c("A request was overwritten",a,this.channelName),this._requests[a]={callback:i(b),context:e||this},this)},replyOnce:function(a,c,e){if(d(this,"replyOnce",a,[c,e]))return this;var f=this,g=b.once(function(){return f.stopReplying(a),i(c).apply(this,arguments)});return this.reply(a,g,e)},stopReplying:function(a,b,e){return d(this,"stopReplying",a)?this:(a||b||e?g(this._requests,a,b,e)||c("Attempted to remove the unregistered request",a,this.channelName):delete this._requests,this)}},k._channels={},k.channel=function(a){if(!a)throw new Error("You must provide a name for the channel.");return k._channels[a]?k._channels[a]:k._channels[a]=new k.Channel(a)},k.Channel=function(a){this.channelName=a},b.extend(k.Channel.prototype,a.Events,k.Commands,k.Requests,{reset:function(){return this.off(),this.stopListening(),this.stopComplying(),this.stopReplying(),this}});var n,o,p=[a.Events,k.Commands,k.Requests];return b.each(p,function(a){b.each(a,function(a,c){k[c]=function(a){return o=b.rest(arguments),n=this.channel(a),n[c].apply(n,o)}})}),k});
+!function(a,b){if("function"==typeof define&&define.amd)define(["backbone","underscore"],function(a,c){return b(a,c)});else if("undefined"!=typeof exports){var c=require("backbone"),d=require("underscore");module.exports=b(c,d)}else b(a.Backbone,a._)}(this,function(a,b){"use strict";function c(a,b,c){if(k.DEBUG){var d=c?" on the "+c+" channel":"";console.warn(a+d+': "'+b+'"')}}function d(a,b,c,d){if(!c)return!1;var e=[];if("object"==typeof c){for(var f in c)e.push(a[b].apply(a,[f,c[f]].concat(d)));return e}if(l.test(c)){for(var g=c.split(l),h=0,i=g.length;i>h;h++)e.push(a[b].apply(a,[g[h]].concat(d)));return e}return!1}function e(a,b,c){var d=c[0],e=c[1],f=c[2];switch(c.length){case 0:return a.call(b);case 1:return a.call(b,d);case 2:return a.call(b,d,e);case 3:return a.call(b,d,e,f);default:return a.apply(b,c)}}function f(a,b,c,d){var e=a[b];return c&&c!==e.callback&&c!==e.callback._callback||d&&d!==e.context?void 0:(delete a[b],!0)}function g(a,c,d,e){a||(a={});for(var g=c?[c]:b.keys(a),h=!1,i=0,j=g.length;j>i;i++)c=g[i],a[c]&&f(a,c,d,e)&&(h=!0);return h}function h(a){return m[a]||(m[a]=b.partial(k.log,a))}function i(a){return b.isFunction(a)?a:b.constant(a)}var j=a.Radio,k=a.Radio={};k.VERSION="0.8.1",k.noConflict=function(){return a.Radio=j,this},k.DEBUG=!1;var l=/\s+/,m={};b.extend(k,{log:function(a,c){var d=b.rest(arguments,2);console.log("["+a+'] "'+c+'"',d)},tuneIn:function(a){var b=k.channel(a);return b._tunedIn=!0,b.on("all",h(a)),this},tuneOut:function(a){var b=k.channel(a);return b._tunedIn=!1,b.off("all",h(a)),delete m[a],this}}),k.Commands={command:function(a){var f=b.rest(arguments);if(d(this,"command",a,f))return this;var g=this.channelName,h=this._commands;if(g&&this._tunedIn&&k.log.apply(this,[g,a].concat(f)),h&&(h[a]||h["default"])){var i=h[a]||h["default"];f=h[a]?f:arguments,e(i.callback,i.context,f)}else c("An unhandled command was fired",a,g);return this},comply:function(a,b,e){return d(this,"comply",a,[b,e])?this:(this._commands||(this._commands={}),this._commands[a]&&c("A command was overwritten",a,this.channelName),this._commands[a]={callback:b,context:e||this},this)},complyOnce:function(a,c,e){if(d(this,"complyOnce",a,[c,e]))return this;var f=this,g=b.once(function(){return f.stopComplying(a),c.apply(this,arguments)});return this.comply(a,g,e)},stopComplying:function(a,b,e){return d(this,"stopComplying",a)?this:(a||b||e?g(this._commands,a,b,e)||c("Attempted to remove the unregistered command",a,this.channelName):delete this._commands,this)}},k.Requests={request:function(a){var f=b.rest(arguments),g=d(this,"request",a,f);if(g)return g;var h=this.channelName,i=this._requests;if(h&&this._tunedIn&&k.log.apply(this,[h,a].concat(f)),i&&(i[a]||i["default"])){var j=i[a]||i["default"];return f=i[a]?f:arguments,e(j.callback,j.context,f)}c("An unhandled request was fired",a,h)},reply:function(a,b,e){return d(this,"reply",a,[b,e])?this:(this._requests||(this._requests={}),this._requests[a]&&c("A request was overwritten",a,this.channelName),this._requests[a]={callback:i(b),context:e||this},this)},replyOnce:function(a,c,e){if(d(this,"replyOnce",a,[c,e]))return this;var f=this,g=b.once(function(){return f.stopReplying(a),i(c).apply(this,arguments)});return this.reply(a,g,e)},stopReplying:function(a,b,e){return d(this,"stopReplying",a)?this:(a||b||e?g(this._requests,a,b,e)||c("Attempted to remove the unregistered request",a,this.channelName):delete this._requests,this)}},k._channels={},k.channel=function(a){if(!a)throw new Error("You must provide a name for the channel.");return k._channels[a]?k._channels[a]:k._channels[a]=new k.Channel(a)},k.Channel=function(a){this.channelName=a},b.extend(k.Channel.prototype,a.Events,k.Commands,k.Requests,{reset:function(){return this.off(),this.stopListening(),this.stopComplying(),this.stopReplying(),this}});var n,o,p=[a.Events,k.Commands,k.Requests];return b.each(p,function(a){b.each(a,function(a,c){k[c]=function(a){return o=b.rest(arguments),n=this.channel(a),n[c].apply(n,o)}})}),k});
 //# sourceMappingURL=backbone.radio.min.js.map
\ No newline at end of file
diff --git a/build/backbone.radio.min.js.map b/build/backbone.radio.min.js.map
index b9492a0..dd1ce10 100644
--- a/build/backbone.radio.min.js.map
+++ b/build/backbone.radio.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"backbone.radio.min.js","sources":["backbone.radio.js"],"names":["root","factory","define","amd","Backbone","_","exports","require","module","this","debugLog","warning","eventName","channelName","Radio","DEBUG","channelText","console","warn","eventsApi","obj","action","name","rest","results","key","push","apply","concat","eventSplitter","test","names","split","i","l","length","callHandler","callback","context","args","a1","a2","a3","call","removeHandler","store","event","_callback","removeHandlers","keys","matched","_partial","_logs","partial","log","makeCallback","isFunction","constant","previousRadio","VERSION","noConflict","extend","arguments","tuneIn","channel","_tunedIn","on","tuneOut","off","Commands","command","commands","_commands","handler","comply","complyOnce","self","once","stopComplying","Requests","request","requests","_requests","reply","replyOnce","stopReplying","_channels","Error","Channel","prototype","Events","reset","stopListening","systems","each","system","method","methodName"],"mappings":";;CACC,SAASA,EAAMC,GACd,GAAsB,kBAAXC,SAAyBA,OAAOC,IACzCD,QAAQ,WAAY,cAAe,SAASE,EAAUC,GACpD,MAAOJ,GAAQG,EAAUC,SAGxB,IAAuB,mBAAZC,SAAyB,CACvC,GAAIF,GAAWG,QAAQ,YACnBF,EAAIE,QAAQ,aAChBC,QAAOF,QAAUL,EAAQG,EAAUC,OAGnCJ,GAAQD,EAAKI,SAAUJ,EAAKK,IAE9BI,KAAM,SAASL,EAAUC,GACzB,YAyBA,SAASK,GAASC,EAASC,EAAWC,GACpC,GAAIC,EAAMC,MAAO,CACf,GAAIC,GAAcH,EAAc,WAAaA,EAAc,WAAa,EACxEI,SAAQC,KAAKP,EAAUK,EAAc,MAAQJ,EAAY,MAU7D,QAASO,GAAUC,EAAKC,EAAQC,EAAMC,GACpC,IAAKD,EACH,OAAO,CAGT,IAAIE,KAGJ,IAAoB,gBAATF,GAAmB,CAC5B,IAAK,GAAIG,KAAOH,GACdE,EAAQE,KAAKN,EAAIC,GAAQM,MAAMP,GAAMK,EAAKH,EAAKG,IAAMG,OAAOL,IAE9D,OAAOC,GAIT,GAAIK,EAAcC,KAAKR,GAAO,CAE5B,IAAK,GADDS,GAAQT,EAAKU,MAAMH,GACdI,EAAI,EAAGC,EAAIH,EAAMI,OAAYD,EAAJD,EAAOA,IACvCT,EAAQE,KAAKN,EAAIC,GAAQM,MAAMP,GAAMW,EAAME,IAAIL,OAAOL,IAExD,OAAOC,GAGT,OAAO,EAIT,QAASY,GAAYC,EAAUC,EAASC,GACtC,GAAIC,GAAKD,EAAK,GAAIE,EAAKF,EAAK,GAAIG,EAAKH,EAAK,EAC1C,QAAOA,EAAKJ,QACV,IAAK,GAAG,MAAOE,GAASM,KAAKL,EAC7B,KAAK,GAAG,MAAOD,GAASM,KAAKL,EAASE,EACtC,KAAK,GAAG,MAAOH,GAASM,KAAKL,EAASE,EAAIC,EAC1C,KAAK,GAAG,MAAOJ,GAASM,KAAKL,EAASE,EAAIC,EAAIC,EAC9C,SAAS,MAAOL,GAASV,MAAMW,EAASC,IAK5C,QAASK,GAAcC,EAAOvB,EAAMe,EAAUC,GAC5C,GAAIQ,GAAQD,EAAMvB,EAClB,QACIe,IAAaC,GACfD,IAAaA,IAAaS,EAAMT,UAAYA,IAAaS,EAAMT,SAASU,YACxET,GAAWA,IAAYQ,EAAMR,eAEtBO,GAAMvB,IACN,GANT,OAUF,QAAS0B,GAAeH,EAAOvB,EAAMe,EAAUC,GAC7CO,IAAUA,KAIV,KAAK,GAHDd,GAAQT,GAAQA,GAAQjB,EAAE4C,KAAKJ,GAC/BK,GAAU,EAELjB,EAAI,EAAGE,EAASJ,EAAMI,OAAYA,EAAJF,EAAYA,IACjDX,EAAOS,EAAME,GAIRY,EAAMvB,IAIPsB,EAAcC,EAAOvB,EAAMe,EAAUC,KACvCY,GAAU,EAId,OAAOA,GAcT,QAASC,GAAStC,GAChB,MAAOuC,GAAMvC,KAAiBuC,EAAMvC,GAAeR,EAAEgD,QAAQvC,EAAMwC,IAAKzC,IA4H1E,QAAS0C,GAAalB,GACpB,MAAOhC,GAAEmD,WAAWnB,GAAYA,EAAWhC,EAAEoD,SAASpB,GAvPxD,GAAIqB,GAAgBtD,EAASU,MAEzBA,EAAQV,EAASU,QAErBA,GAAM6C,QAAU,QAMhB7C,EAAM8C,WAAa,WAEjB,MADAxD,GAASU,MAAQ4C,EACVjD,MAKTK,EAAMC,OAAQ,CAad,IAAIc,GAAgB,MAuFhBuB,IAQJ/C,GAAEwD,OAAO/C,GAGPwC,IAAK,SAASzC,EAAaD,GACzB,GAAI2B,GAAOlC,EAAEkB,KAAKuC,UAAW,EAC7B7C,SAAQqC,IAAI,IAAMzC,EAAc,MAAQD,EAAY,IAAK2B,IAM3DwB,OAAQ,SAASlD,GACf,GAAImD,GAAUlD,EAAMkD,QAAQnD,EAG5B,OAFAmD,GAAQC,UAAW,EACnBD,EAAQE,GAAG,MAAOf,EAAStC,IACpBJ,MAIT0D,QAAS,SAAStD,GAChB,GAAImD,GAAUlD,EAAMkD,QAAQnD,EAI5B,OAHAmD,GAAQC,UAAW,EACnBD,EAAQI,IAAI,MAAOjB,EAAStC,UACrBuC,GAAMvC,GACNJ,QAWXK,EAAMuD,UAGJC,QAAS,SAAShD,GAChB,GAAIiB,GAAOlC,EAAEkB,KAAKuC,UAClB,IAAI3C,EAAUV,KAAM,UAAWa,EAAMiB,GACnC,MAAO9B,KAET,IAAII,GAAcJ,KAAKI,YACnB0D,EAAW9D,KAAK+D,SAQpB,IALI3D,GAAeJ,KAAKwD,UACtBnD,EAAMwC,IAAI3B,MAAMlB,MAAOI,EAAaS,GAAMM,OAAOW,IAI/CgC,IAAaA,EAASjD,IAASiD,EAAS,YAAa,CACvD,GAAIE,GAAUF,EAASjD,IAASiD,EAAS,UACzChC,GAAOgC,EAASjD,GAAQiB,EAAOuB,UAC/B1B,EAAYqC,EAAQpC,SAAUoC,EAAQnC,QAASC,OAE/C7B,GAAS,iCAAkCY,EAAMT,EAGnD,OAAOJ,OAITiE,OAAQ,SAASpD,EAAMe,EAAUC,GAC/B,MAAInB,GAAUV,KAAM,SAAUa,GAAOe,EAAUC,IACtC7B,MAETA,KAAK+D,YAAc/D,KAAK+D,cAEpB/D,KAAK+D,UAAUlD,IACjBZ,EAAS,4BAA6BY,EAAMb,KAAKI,aAGnDJ,KAAK+D,UAAUlD,IACbe,SAAUA,EACVC,QAASA,GAAW7B,MAGfA,OAITkE,WAAY,SAASrD,EAAMe,EAAUC,GACnC,GAAInB,EAAUV,KAAM,aAAca,GAAOe,EAAUC,IACjD,MAAO7B,KAET,IAAImE,GAAOnE,KAEPoE,EAAOxE,EAAEwE,KAAK,WAEhB,MADAD,GAAKE,cAAcxD,GACZe,EAASV,MAAMlB,KAAMqD,YAG9B,OAAOrD,MAAKiE,OAAOpD,EAAMuD,EAAMvC,IAIjCwC,cAAe,SAASxD,EAAMe,EAAUC,GACtC,MAAInB,GAAUV,KAAM,gBAAiBa,GAC5Bb,MAIJa,GAASe,GAAaC,EAEfU,EAAevC,KAAK+D,UAAWlD,EAAMe,EAAUC,IACzD5B,EAAS,+CAAgDY,EAAMb,KAAKI,mBAF7DJ,MAAK+D,UAKP/D,QAeXK,EAAMiE,UAGJC,QAAS,SAAS1D,GAChB,GAAIiB,GAAOlC,EAAEkB,KAAKuC,WACdtC,EAAUL,EAAUV,KAAM,UAAWa,EAAMiB,EAC/C,IAAIf,EACF,MAAOA,EAET,IAAIX,GAAcJ,KAAKI,YACnBoE,EAAWxE,KAAKyE,SAQpB,IALIrE,GAAeJ,KAAKwD,UACtBnD,EAAMwC,IAAI3B,MAAMlB,MAAOI,EAAaS,GAAMM,OAAOW,IAI/C0C,IAAaA,EAAS3D,IAAS2D,EAAS,YAAa,CACvD,GAAIR,GAAUQ,EAAS3D,IAAS2D,EAAS,UAEzC,OADA1C,GAAO0C,EAAS3D,GAAQiB,EAAOuB,UACxB1B,EAAYqC,EAAQpC,SAAUoC,EAAQnC,QAASC,GAEtD7B,EAAS,iCAAkCY,EAAMT,IAKrDsE,MAAO,SAAS7D,EAAMe,EAAUC,GAC9B,MAAInB,GAAUV,KAAM,QAASa,GAAOe,EAAUC,IACrC7B,MAGTA,KAAKyE,YAAczE,KAAKyE,cAEpBzE,KAAKyE,UAAU5D,IACjBZ,EAAS,4BAA6BY,EAAMb,KAAKI,aAGnDJ,KAAKyE,UAAU5D,IACbe,SAAUkB,EAAalB,GACvBC,QAASA,GAAW7B,MAGfA,OAIT2E,UAAW,SAAS9D,EAAMe,EAAUC,GAClC,GAAInB,EAAUV,KAAM,YAAaa,GAAOe,EAAUC,IAChD,MAAO7B,KAGT,IAAImE,GAAOnE,KAEPoE,EAAOxE,EAAEwE,KAAK,WAEhB,MADAD,GAAKS,aAAa/D,GACXiC,EAAalB,GAAUV,MAAMlB,KAAMqD,YAG5C,OAAOrD,MAAK0E,MAAM7D,EAAMuD,EAAMvC,IAIhC+C,aAAc,SAAS/D,EAAMe,EAAUC,GACrC,MAAInB,GAAUV,KAAM,eAAgBa,GAC3Bb,MAIJa,GAASe,GAAaC,EAEfU,EAAevC,KAAKyE,UAAW5D,EAAMe,EAAUC,IACzD5B,EAAS,+CAAgDY,EAAMb,KAAKI,mBAF7DJ,MAAKyE,UAKPzE,QAWXK,EAAMwE,aAENxE,EAAMkD,QAAU,SAASnD,GACvB,IAAKA,EACH,KAAM,IAAI0E,OAAM,2CAGlB,OAAIzE,GAAMwE,UAAUzE,GACXC,EAAMwE,UAAUzE,GAEfC,EAAMwE,UAAUzE,GAAe,GAAIC,GAAM0E,QAAQ3E,IAY7DC,EAAM0E,QAAU,SAAS3E,GACvBJ,KAAKI,YAAcA,GAGrBR,EAAEwD,OAAO/C,EAAM0E,QAAQC,UAAWrF,EAASsF,OAAQ5E,EAAMuD,SAAUvD,EAAMiE,UAGvEY,MAAO,WAKL,MAJAlF,MAAK2D,MACL3D,KAAKmF,gBACLnF,KAAKqE,gBACLrE,KAAK4E,eACE5E,OAYX,IAAIuD,GAASzB,EAAMsD,GAAWzF,EAASsF,OAAQ5E,EAAMuD,SAAUvD,EAAMiE,SAarE,OAXA1E,GAAEyF,KAAKD,EAAS,SAASE,GACvB1F,EAAEyF,KAAKC,EAAQ,SAASC,EAAQC,GAC9BnF,EAAMmF,GAAc,SAASpF,GAG3B,MAFA0B,GAAOlC,EAAEkB,KAAKuC,WACdE,EAAUvD,KAAKuD,QAAQnD,GAChBmD,EAAQiC,GAAYtE,MAAMqC,EAASzB,QAMzCzB"}
\ No newline at end of file
+{"version":3,"file":"backbone.radio.min.js","sources":["backbone.radio.js"],"names":["root","factory","define","amd","Backbone","_","exports","require","module","this","debugLog","warning","eventName","channelName","Radio","DEBUG","channelText","console","warn","eventsApi","obj","action","name","rest","results","key","push","apply","concat","eventSplitter","test","names","split","i","l","length","callHandler","callback","context","args","a1","a2","a3","call","removeHandler","store","event","_callback","removeHandlers","keys","matched","_partial","_logs","partial","log","makeCallback","isFunction","constant","previousRadio","VERSION","noConflict","extend","arguments","tuneIn","channel","_tunedIn","on","tuneOut","off","Commands","command","commands","_commands","handler","comply","complyOnce","self","once","stopComplying","Requests","request","requests","_requests","reply","replyOnce","stopReplying","_channels","Error","Channel","prototype","Events","reset","stopListening","systems","each","system","method","methodName"],"mappings":"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"}
\ No newline at end of file
diff --git a/package.json b/package.json
index 758bd5a..6e17db1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "backbone.radio",
   "description": "The semantic messaging system for Backbone applications.",
   "homepage": "https://github.com/marionettejs/backbone.radio",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "homepage": "https://github.com/marionettejs/backbone.radio",
   "main": "build/backbone.radio.js",
   "keywords": [