diff --git a/amxmodx/CPlugin.cpp b/amxmodx/CPlugin.cpp
index d7a1bbfc..de8327f3 100755
--- a/amxmodx/CPlugin.cpp
+++ b/amxmodx/CPlugin.cpp
@@ -541,29 +541,26 @@ void CPluginMngr::CacheAndLoadModules(const char *plugin)
 
 	CVector<LibDecoder *> expects;
 	CVector<LibDecoder *> defaults;
+	CStack<LibDecoder *> delstack;
 	for (int i=0; i<num; i++)
 	{
 		amx_GetTag(&amx, i, name, &tag_id);
 		if (name[0] == '?')
 		{
 			LibDecoder *dc = new LibDecoder;
+			delstack.push(dc);
 			if (DecodeLibCmdString(name, dc))
 			{
 				if (dc->cmd == LibCmd_ForceLib)
 				{
 					RunLibCommand(dc);
-					delete dc;
 				} else if ( (dc->cmd == LibCmd_ExpectClass) ||
 							(dc->cmd == LibCmd_ExpectLib) ) 
 				{
 					expects.push_back(dc);
 				} else if (dc->cmd == LibCmd_DefaultLib) {
 					defaults.push_back(dc);
-				} else {
-					delete dc;
 				}
-			} else {
-				delete dc;
 			}
 		}
 	}
@@ -571,12 +568,19 @@ void CPluginMngr::CacheAndLoadModules(const char *plugin)
 	for (size_t i=0; i<expects.size(); i++)
 	{
 		RunLibCommand(expects[i]);
-		delete expects[i];
 	}
 	for (size_t i=0; i<defaults.size(); i++)
 	{
 		RunLibCommand(defaults[i]);
-		delete defaults[i];
+	}
+
+	expects.clear();
+	defaults.clear();
+
+	while (!delstack.empty())
+	{
+		delete delstack.front();
+		delstack.pop();
 	}
 
 	return;
diff --git a/amxmodx/libraries.h b/amxmodx/libraries.h
index df89ad4b..69c296e2 100644
--- a/amxmodx/libraries.h
+++ b/amxmodx/libraries.h
@@ -42,14 +42,18 @@ enum LibError
 	LibErr_NoClass,
 };
 
-struct LibDecoder
+class LibDecoder
 {
+public:
 	LibDecoder() : buffer(NULL)
 	{
-	};
+	}
 	~LibDecoder()
 	{
 		free(buffer);
+		buffer = NULL;
+		param1 = NULL;
+		param2 = NULL;
 	}
 	char *buffer;
 	char *param1;