diff --git a/CHANGELOG b/CHANGELOG
index 13d7623668..3d8ece58b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Allow to use globals in domain and states
 * Add translate attribute on Selection field
 * Use explicit join in search SQL query
 * Fix for host with IPv6 enable but without default IPv6 route
diff --git a/trytond/osv/orm.py b/trytond/osv/orm.py
index 4d8c35c80e..d9ab78783e 100644
--- a/trytond/osv/orm.py
+++ b/trytond/osv/orm.py
@@ -262,8 +262,21 @@ class EvalEnvironment(dict):
         return super(EvalEnvironment, self).__getitem__(item)
 
     def __getattr__(self, item):
-        return self.__getitem__(item)
+        try:
+            return self.__getitem__(item)
+        except:
+            pass
+        return super(EvalEnvironment, self).__getattr__(item)
 
+    def get(self, item):
+        try:
+            return self.__getitem__(item)
+        except:
+            pass
+        return super(EvalEnvironment, self).get(item)
+
+    def __nonzero__(self):
+        return bool(self.obj)
 
 class ORM(object):
     """