diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 0a1dae094..f28874948 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -599,7 +599,7 @@ class AdminModulesControllerCore extends AdminController
 					}
 
 					// If Addons module, download and unzip it before installing it
-					if (!is_dir('../modules/'.$name.'/'))
+					if (!file_exists('../modules/'.$name.'/'.$name.'.php'))
 					{
 						$filesList = array(
 							array('type' => 'addonsNative', 'file' => Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST, 'loggedOnAddons' => 0),
@@ -623,6 +623,7 @@ class AdminModulesControllerCore extends AdminController
 									}
 							}
 					}
+
 					// Check potential error
 					if (!($module = Module::getInstanceByName(urldecode($name))))
 						$this->errors[] = $this->l('Module not found');
diff --git a/modules/pscleaner/pscleaner.php b/modules/pscleaner/pscleaner.php
index 22eecf236..549ce1b4a 100644
--- a/modules/pscleaner/pscleaner.php
+++ b/modules/pscleaner/pscleaner.php
@@ -244,13 +244,14 @@ class PSCleaner extends Module
 		$queries = self::bulle($queries);
 		foreach ($queries as $query_array)
 		{
-			if(!isset($query_array[4]) || (isset($query_array[4]) && Module::isInstalled($query_array[4])))
-			{
-				$query = 'DELETE FROM `'._DB_PREFIX_.$query_array[0].'` WHERE `'.$query_array[1].'` NOT IN (SELECT `'.$query_array[3].'` FROM `'._DB_PREFIX_.$query_array[2].'`)';
-				$db->Execute($query);
-				if ($affected_rows = $db->Affected_Rows())
-					$logs[$query] = $affected_rows;
-			}
+			// If this is a module and the module is not installed, we continue
+			if (isset($query_array[4]) && !Module::isInstalled($query_array[4]))
+				continue;
+
+			$query = 'DELETE FROM `'._DB_PREFIX_.$query_array[0].'` WHERE `'.$query_array[1].'` NOT IN (SELECT `'.$query_array[3].'` FROM `'._DB_PREFIX_.$query_array[2].'`)';
+			$db->Execute($query);
+			if ($affected_rows = $db->Affected_Rows())
+				$logs[$query] = $affected_rows;
 		}
 
 		// _lang table cleaning