diff --git a/src/pubsub.js b/src/pubsub.js
index 84dbe9d..3b4c57f 100755
--- a/src/pubsub.js
+++ b/src/pubsub.js
@@ -21,7 +21,7 @@ https://github.com/mroderick/PubSubJS
     var PubSub = {};
     root.PubSub = PubSub;
     factory(PubSub);
-    
+
 }(( typeof window === 'object' && window ) || this, function (PubSub){
 	'use strict';
 
@@ -179,7 +179,7 @@ https://github.com/mroderick/PubSubJS
 	/*Public: Clear subscriptions by the topic
 	*/
 	PubSub.clearSubscriptions = function clearSubscriptions(topic){
-		var m; 
+		var m;
 		for (m in messages){
 			if (messages.hasOwnProperty(m) && m.indexOf(topic) === 0){
 				delete messages[m];
@@ -214,7 +214,7 @@ https://github.com/mroderick/PubSubJS
 			m, message, t;
 
 		if (isTopic){
-			delete messages[value];
+			PubSub.clearSubscriptions(value);
 			return;
 		}
 
diff --git a/test/test-unsubscribe.js b/test/test-unsubscribe.js
index a22eb62..848229f 100644
--- a/test/test-unsubscribe.js
+++ b/test/test-unsubscribe.js
@@ -115,7 +115,7 @@
 
 			PubSub.unsubscribe(topicB);
 
-			PubSub.publishSync(topicA, TestHelper.getUniqueString());
+			PubSub.publishSync(topicC, TestHelper.getUniqueString());
 
 			assert(spyA.called);
 			refute(spyB.called);