diff --git a/i3pystatus/core/__init__.py b/i3pystatus/core/__init__.py
index b470ad4..e101b93 100644
--- a/i3pystatus/core/__init__.py
+++ b/i3pystatus/core/__init__.py
@@ -51,7 +51,7 @@ class Status:
 
     def run_command_endpoint(self):
         for command in io.JSONIO(io=io.IOHandler(sys.stdin, open(os.devnull, "w")), skiplines=1).read():
-            module = self.modules.get_by_id(command["instance"])
+            module = self.modules.get_module_by_id(command["instance"])
             if module:
                 module.on_click(command["button"])
 
diff --git a/i3pystatus/core/util.py b/i3pystatus/core/util.py
index 10f2877..befd129 100644
--- a/i3pystatus/core/util.py
+++ b/i3pystatus/core/util.py
@@ -82,12 +82,11 @@ class ModuleList(collections.UserList):
         super().append(module)
         return module
 
-    def get_by_id(self, find_id):
+    def get_module_by_id(self, find_id):
         find_id = int(find_id)
         for module in self:
             if int(id(module)) == find_id:
                 return module
-        return None
 
 
 class PrefixedKeyDict(collections.UserDict):