diff --git a/src/extensible.cpp b/src/extensible.cpp
index 9284bdbf2..d977e0b3c 100644
--- a/src/extensible.cpp
+++ b/src/extensible.cpp
@@ -24,8 +24,8 @@ ExtensibleBase::~ExtensibleBase()
 
 Extensible::~Extensible()
 {
-	for (std::set<ExtensibleBase *>::iterator it = extension_items.begin(); it != extension_items.end(); ++it)
-		(*it)->Unset(this);
+	while (!extension_items.empty())
+		(*extension_items.begin())->Unset(this);
 }
 
 bool Extensible::HasExt(const Anope::string &name) const