diff --git a/examples/tinymqtt-test/tinymqtt-test.ino b/examples/tinymqtt-test/tinymqtt-test.ino
index 866593a..9d112e9 100644
--- a/examples/tinymqtt-test/tinymqtt-test.ino
+++ b/examples/tinymqtt-test/tinymqtt-test.ino
@@ -399,11 +399,11 @@ void loop()
 					}
 					if (client)
 					{
-						clients.erase(s);
 						for (auto it: clients)
 						{
 							if (it.second != client) continue;
 							Serial << "deleted" << endl;
+							delete (it.second);
 							clients.erase(it.first);
 							break;
 						}
@@ -413,9 +413,9 @@ void loop()
 					{
 						for(auto it: brokers)
 						{
-							Serial << (int32_t)it.second << '/' << (int32_t)broker << endl;
 							if (broker != it.second) continue;
 							Serial << "deleted" << endl;
+							delete (it.second);
 							brokers.erase(it.first);
 							break;
 						}
diff --git a/src/TinyMqtt.cpp b/src/TinyMqtt.cpp
index 3a95f39..9e3f3ce 100644
--- a/src/TinyMqtt.cpp
+++ b/src/TinyMqtt.cpp
@@ -19,6 +19,7 @@ MqttBroker::~MqttBroker()
 	{
 		delete clients[0];
 	}
+	server.close();
 }
 
 // private constructor used by broker only