diff --git a/modules/modpython/pyeval.py b/modules/pyeval.py
similarity index 98%
rename from modules/modpython/pyeval.py
rename to modules/pyeval.py
index f353f264..a8933488 100644
--- a/modules/modpython/pyeval.py
+++ b/modules/pyeval.py
@@ -53,13 +53,13 @@ class pyeval(znc.Module, InteractiveInterpreter):
         self.locals['znc'] = znc
         self.locals['module'] = self
         self.locals['user'] = self.GetUser()
-        self.locals['network'] = self.GetNetwork()
         self.indent = re.compile(r'^>+')
 
         return True
 
     def OnModCommand(self, line):
         self.locals['client'] = self.GetClient()
+        self.locals['network'] = self.GetNetwork()
 
         # Hijack sys.stdout.write
         stdout_write = sys.stdout.write
@@ -76,4 +76,5 @@ class pyeval(znc.Module, InteractiveInterpreter):
         # Revert sys.stdout.write
         sys.stdout.write = stdout_write
         del self.locals['client']
+        del self.locals['network']