diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1b8e2355..bcf7c3c8 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -3,6 +3,8 @@ Broker:
   not being set correctly. Closes #1429.
 - Fix incorrect memory tracking causing problems with memory_limit option.
   Closes #1437.
+- Fix subscription topics being limited to 200 characters instead of 200
+  hierarchy levels. Closes #1441.
 
 Client library:
 - Fix publish properties not being passed to on_message_v5 callback for QoS 2
diff --git a/src/subs.c b/src/subs.c
index 266669e8..fc62bef8 100644
--- a/src/subs.c
+++ b/src/subs.c
@@ -243,9 +243,9 @@ static int sub__topic_tokenise(const char *subtopic, struct sub__token **topics)
 
 	stop = 0;
 	for(i=start; i<len+1; i++){
-		count++;
 		if(subtopic[i] == '/' || subtopic[i] == '\0'){
 			stop = i;
+			count++;
 
 			if(start != stop){
 				tlen = stop-start;
diff --git a/test/broker/02-subpub-qos0-long-topic.py b/test/broker/02-subpub-qos0-long-topic.py
new file mode 100755
index 00000000..7cd144ab
--- /dev/null
+++ b/test/broker/02-subpub-qos0-long-topic.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+
+# Test whether a client subscribed to a topic receives its own message sent to that topic, for long topics.
+
+from mosq_test_helper import *
+
+def do_test(topic, succeeds):
+    rc = 1
+    mid = 53
+    keepalive = 60
+    connect_packet = mosq_test.gen_connect("subpub-qos0-test", keepalive=keepalive)
+    connack_packet = mosq_test.gen_connack(rc=0)
+
+    subscribe_packet = mosq_test.gen_subscribe(mid, topic, 0)
+    suback_packet = mosq_test.gen_suback(mid, 0)
+
+    publish_packet = mosq_test.gen_publish(topic, qos=0, payload="message")
+
+    port = mosq_test.get_port()
+    broker = mosq_test.start_broker(filename=os.path.basename(__file__), port=port)
+
+    try:
+        sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port)
+
+        if succeeds == True:
+            mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback")
+            mosq_test.do_send_receive(sock, publish_packet, publish_packet, "publish")
+        else:
+            mosq_test.do_send_receive(sock, subscribe_packet, b"", "suback")
+
+        rc = 0
+
+        sock.close()
+    finally:
+        broker.terminate()
+        broker.wait()
+        (stdo, stde) = broker.communicate()
+        if rc:
+            print(stde.decode('utf-8'))
+            exit(rc)
+
+do_test("/"*200, True) # 200 max hierarchy limit
+do_test("abc/"*199+"d", True) # 200 max hierarchy limit, longer overall string than 200
+
+do_test("/"*201, False) # Exceeds 200 max hierarchy limit
+do_test("abc/"*200+"d", False) # Exceeds 200 max hierarchy limit, longer overall string than 200
+
+
+exit(0)
+
diff --git a/test/broker/Makefile b/test/broker/Makefile
index 3b78a1d2..e26a06b3 100644
--- a/test/broker/Makefile
+++ b/test/broker/Makefile
@@ -50,6 +50,7 @@ endif
 02 :
 	./02-shared-qos0-v5.py
 	./02-subhier-crash.py
+	./02-subpub-qos0-long-topic.py
 	./02-subpub-qos0-retain-as-publish.py
 	./02-subpub-qos0-send-retain.py
 	./02-subpub-qos0-subscription-id.py
diff --git a/test/broker/test.py b/test/broker/test.py
index 1fff9b7a..b914f4cc 100755
--- a/test/broker/test.py
+++ b/test/broker/test.py
@@ -29,6 +29,7 @@ tests = [
 
     (1, './02-shared-qos0-v5.py'),
     (1, './02-subhier-crash.py'),
+    (1, './02-subpub-qos0-long-topic.py'),
     (1, './02-subpub-qos0-retain-as-publish.py'),
     (1, './02-subpub-qos0-send-retain.py'),
     (1, './02-subpub-qos0-subscription-id.py'),