diff --git a/app/channels/channel_manager.go b/app/channels/channel_manager.go
index 58e5801..71ca412 100644
--- a/app/channels/channel_manager.go
+++ b/app/channels/channel_manager.go
@@ -18,6 +18,7 @@ func NewChannelManager() *ChannelManager {
 		pubsub:   pubsub.New(1),
 		channels: map[string]*Channel{},
 	}
+	return mgr
 }
 
 func (manager *ChannelManager) Channel(uuid string) *Channel {
@@ -42,7 +43,7 @@ func (manager *ChannelManager) Close(uuid string) (err error) {
 		return
 	}
 
-	pubsub.PubSub.Pub("close", manager.channels[uuid])
+	manager.pubsub.Pub(manager.channels[uuid], "close")
 	delete(manager.channels, uuid)
 
 	return
@@ -60,7 +61,7 @@ func (manager *ChannelManager) Open(uuid string) (channel *Channel, err error) {
 	channel = &Channel{Id: uuid}
 	manager.channels[uuid] = channel
 
-	pubsub.PubSub.Pub("open", channel)
+	manager.pubsub.Pub(channel, "open")
 
 	return
 }