diff --git a/relational/maintenance.py b/relational/maintenance.py
index c7845a8..f704fc0 100644
--- a/relational/maintenance.py
+++ b/relational/maintenance.py
@@ -121,7 +121,7 @@ class user_interface (object):
             raise Exception('Invalid name for destination relation')
 
         expr = parser.parse(query)
-        result = eval(expr, self.relations)
+        result = expr(self.relations)
         self.relations[relname] = result
         return result
 
diff --git a/relational_readline/linegui.py b/relational_readline/linegui.py
index 565fc7c..ab3e4ce 100644
--- a/relational_readline/linegui.py
+++ b/relational_readline/linegui.py
@@ -287,7 +287,7 @@ def exec_query(command):
     # Execute query
     try:
         pyquery = parser.parse(query)
-        result = eval(pyquery, relations)
+        result = pyquery(relations)
 
         print (colorize("-> query: %s" % pyquery, 0x00ff00))