1 files changed, 5 insertions, 1 deletions
diff --git a/src/libjin/common/subsystem.h b/src/libjin/common/subsystem.h
index 55b0f0d..90e8570 100644
--- a/src/libjin/common/subsystem.h
+++ b/src/libjin/common/subsystem.h
@@ -16,7 +16,7 @@ namespace jin
 
         void init(const SettingBase* setting)
         {
-            CallOnce(initSystem(setting));
+            CALLONCE(initSystem(setting));
         }
 
         void quit()
@@ -26,11 +26,15 @@ namespace jin
         }
 
     protected:
+
         Subsystem() {};
         virtual ~Subsystem() {};
 
+        SINGLETON(System);
+
         virtual bool initSystem(const Setting* setting) = 0;
         virtual void quitSystem() = 0;
+
     };
 
 }