diff --git a/src/risotto/controller.py b/src/risotto/controller.py
index 459751b..2f6ca42 100644
--- a/src/risotto/controller.py
+++ b/src/risotto/controller.py
@@ -11,7 +11,7 @@ class Controller:
     """
     def __init__(self,
                  test: bool):
-        self.risotto_modules = services.get_list()
+        self.risotto_modules = services.get_modules_list()
 
     async def call(self,
                    uri: str,
diff --git a/src/risotto/register.py b/src/risotto/register.py
index e0027e9..3a5715e 100644
--- a/src/risotto/register.py
+++ b/src/risotto/register.py
@@ -37,7 +37,7 @@ class Services():
     def get_modules(self):
         if not self.modules_loaded:
             self.load_modules()
-        return [(m, getattr(self, m)) for s in self.get_modules_list()]
+        return [(m, getattr(self, m)) for s in self.services.values() for m in s]
 
     def get_services_list(self):
         return self.services.keys()