diff --git a/phpBB/phpbb/files/factory.php b/phpBB/phpbb/files/factory.php
index 508c50c6ce..b28a7ab659 100644
--- a/phpBB/phpbb/files/factory.php
+++ b/phpBB/phpbb/files/factory.php
@@ -42,7 +42,7 @@ class factory
 	{
 		$service = false;
 
-		$name = (strpos($name, 'files.') === false) ? 'files.' . $name : $name;
+		$name = (strpos($name, 'files.') === false && strpos($name, '.') === false) ? 'files.' . $name : $name;
 
 		try
 		{