diff --git a/Gopkg.lock b/Gopkg.lock
index d9a1d9b..2b79171 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -75,7 +75,7 @@
   branch = "master"
   name = "github.com/r3labs/broadcast"
   packages = ["."]
-  revision = "54cc293e8f0266abffe84fb75bdce10f4e63e6f6"
+  revision = "3201c0671907e667adfd457d5e08be075f59dfcc"
 
 [[projects]]
   branch = "master"
diff --git a/Gopkg.toml b/Gopkg.toml
index 8d8136e..e6432be 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -39,7 +39,3 @@
 [[constraint]]
   name = "github.com/r3labs/broadcast"
   branch = "master"
-
-[[constraint]]
-  name = "github.com/smartystreets/goconvey"
-  version = "1.6.3"
diff --git a/handler.go b/handler.go
index e33aee0..ed6e2ca 100644
--- a/handler.go
+++ b/handler.go
@@ -73,7 +73,7 @@ func register(w http.ResponseWriter, s *Session) (*broadcast.Subscriber, chan *b
 		bc.CreateStream(*s.Stream)
 	}
 
-	sub := bc.GetSubscriber(s.Username)
+	sub := bc.GetStreamSubscriber(*s.Stream, s.Username)
 	if sub == nil {
 		sub = broadcast.NewSubscriber(s.Username)
 		bc.Register(*s.Stream, sub)