diff --git a/function/__init__.py b/function/__init__.py
index 512735c..1b89df0 100644
--- a/function/__init__.py
+++ b/function/__init__.py
@@ -56,7 +56,9 @@ class all_functions(object):
         if self.__devices__ is None:
             self.__devices__ = []
             for name, obj in inspect.getmembers(self):
-                if obj.__class__.__module__.split('.')[0] == 'function':
+                if obj.__class__.__module__ == "devices":
+                    self.__devices__.append(obj)
+                elif obj.__class__.__module__.split('.')[0] == 'function':
                     for devicename, device in inspect.getmembers(obj):
                         if device.__class__.__module__ == "devices":
                             self.__devices__.append(device)