diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 2275a4795..f09237b48 100644
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -60,6 +60,7 @@ FGEnvironmentMgr::~FGEnvironmentMgr ()
 {
   delete _environment;
   delete _controller;
+  remove_subsystem("controller");
   delete fgClouds;
 }