diff --git a/daemon/extension/ScriptConfig.cpp b/daemon/extension/ScriptConfig.cpp
index 9bfdb963..1ac16229 100644
--- a/daemon/extension/ScriptConfig.cpp
+++ b/daemon/extension/ScriptConfig.cpp
@@ -55,21 +55,6 @@ ScriptConfig::Script::Script(const char* name, const char* location)
 }
 
 
-ScriptConfig::Scripts::iterator ScriptConfig::Scripts::Find(const char* name)
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		Script& script = *it;
-		if (!strcmp(script.GetName(), name))
-		{
-			return it;
-		}
-	}
-
-	return end();
-}
-
-
 ScriptConfig::ScriptConfig()
 {
 	InitScripts();
@@ -286,7 +271,12 @@ void ScriptConfig::LoadScripts(Scripts* scripts)
 	Tokenizer tok(g_Options->GetScriptOrder(), ",;");
 	while (const char* scriptName = tok.Next())
 	{
-		Scripts::iterator pos = tmpScripts.Find(scriptName);
+		Scripts::iterator pos = std::find_if(tmpScripts.begin(), tmpScripts.end(),
+			[scriptName](Script& script)
+			{
+				return !strcmp(script.GetName(), scriptName);
+			});
+
 		if (pos != tmpScripts.end())
 		{
 			scripts->splice(scripts->end(), tmpScripts, pos);
diff --git a/daemon/extension/ScriptConfig.h b/daemon/extension/ScriptConfig.h
index 8eef943a..c77b6091 100644
--- a/daemon/extension/ScriptConfig.h
+++ b/daemon/extension/ScriptConfig.h
@@ -66,13 +66,7 @@ public:
 		const char*		GetQueueEvents() { return m_queueEvents; }
 	};
 
-	typedef std::list<Script>  ScriptsBase;
-
-	class Scripts: public ScriptsBase
-	{
-	public:
-		Scripts::iterator	Find(const char* name);
-	};
+	typedef std::list<Script>  Scripts;
 
 	class ConfigTemplate
 	{