diff --git a/fml/install/fml.py b/fml/install/fml.py
index d6172082da..bcef65ea91 100644
--- a/fml/install/fml.py
+++ b/fml/install/fml.py
@@ -701,6 +701,10 @@ def setup_mcp(fml_dir, mcp_dir, dont_gen_conf=True):
     #update workspace
     if not os.path.isfile(os.path.join(fml_dir, 'fmlbuild.properties-sample')):
         mcp_eclipse = os.path.join(mcp_dir, 'eclipse')
+        
+        if os.path.isdir(os.path.join(mcp_eclipse, 'Client')) and os.path.isdir(os.path.join(eclipse_dir, 'Server')):
+            shutil.rmtree(mcp_eclipse)
+            
         if not os.path.isdir(mcp_eclipse) and os.path.isdir(os.path.join(fml_dir, 'eclipse')):
             print 'Fixing MCP Workspace'
             copytree(os.path.join(fml_dir, 'eclipse'), mcp_eclipse)