diff --git a/datamodels/2.x/itop-hub-connector/hubruntimeenvironment.class.inc.php b/datamodels/2.x/itop-hub-connector/hubruntimeenvironment.class.inc.php
index 5b7b18d26..37feb5457 100644
--- a/datamodels/2.x/itop-hub-connector/hubruntimeenvironment.class.inc.php
+++ b/datamodels/2.x/itop-hub-connector/hubruntimeenvironment.class.inc.php
@@ -12,10 +12,14 @@ class HubRunTimeEnvironment extends RunTimeEnvironment
 		
 		if ($sEnvironment != $this->sTargetEnv)
 		{
-			if (is_dir(APPROOT.'/data/'.$this->sTargetEnv.'-modules'))
-			{
-			    SetupUtils::rrmdir(APPROOT.'/data/'.$this->sTargetEnv.'-modules');
-			}
+		    if (is_dir(APPROOT.'/env-'.$this->sTargetEnv))
+		    {
+		        SetupUtils::rrmdir(APPROOT.'/env-'.$this->sTargetEnv);
+		    }
+		    if (is_dir(APPROOT.'/data/'.$this->sTargetEnv.'-modules'))
+		    {
+		        SetupUtils::rrmdir(APPROOT.'/data/'.$this->sTargetEnv.'-modules');
+		    }
 			SetupUtils::copydir(APPROOT.'/data/'.$sEnvironment.'-modules', APPROOT.'/data/'.$this->sTargetEnv.'-modules');
 		}
 	}