diff --git a/spec/javascripts/class/base_spec.js b/spec/javascripts/class/base_spec.js
index 9d50cb3..11365dd 100644
--- a/spec/javascripts/class/base_spec.js
+++ b/spec/javascripts/class/base_spec.js
@@ -279,12 +279,12 @@ describe('Wheel.Base', function() {
     describe('#publish', function() {
       describe('when there is a publisher', function() {
         beforeEach(function() {
-          Wheel.Publisher = Wheel.Base.build();
+          base._publisher = Wheel.Base.build();
         });
 
         it('calls trigger on the publisher', function() {
           var active;
-          Wheel.Publisher.on('active', function() {
+          base._publisher.on('active', function() {
             active = true;
           });
 
@@ -296,7 +296,7 @@ describe('Wheel.Base', function() {
           var expectedData = {foo: 'bar'};
 
           var called;
-          Wheel.Publisher.on('foo', function(data) {
+          base._publisher.on('foo', function(data) {
             expect(data).toEqual(expectedData);
             called = true;
           });
@@ -308,7 +308,6 @@ describe('Wheel.Base', function() {
       });
     });
 
-
     describe('#subscribe', function() {
       describe('when a publisher is available', function() {
         beforeEach(function() {
diff --git a/src/class/base.js b/src/class/base.js
index 3977cce..1aa80db 100644
--- a/src/class/base.js
+++ b/src/class/base.js
@@ -37,12 +37,12 @@ Wheel._Class.subclass('Wheel.Base', {
 
   publish: function(eventType, eventData) {
     this._publisher || this._findPublisher();
-    Wheel.Publisher.trigger(eventType, eventData);
+    this._publisher.trigger(eventType, eventData);
   },
 
   subscribe: function(eventName, callback, context) {
     this._publisher || this._findPublisher();
-    Wheel.Publisher.on(eventName, callback, context || this);
+    this._publisher.on(eventName, callback, context || this);
   },
 
   _findPublisher: function() {