diff --git a/trytond/ir/model.py b/trytond/ir/model.py
index 931f9ed7d2..bcdcc9a5bf 100644
--- a/trytond/ir/model.py
+++ b/trytond/ir/model.py
@@ -194,12 +194,12 @@ class ModelAccess(ModelSQL, ModelView):
             return True
         ir_model_obj = self.pool.get('ir.model')
         user_group_obj = self.pool.get('res.user-res.group')
-        cursor.execute('SELECT MAX(CASE WHEN perm_'+mode+' THEN 1 else 0 END) '
+        cursor.execute('SELECT MAX(CASE WHEN a.perm_'+mode+' THEN 1 else 0 END) '
             'FROM ir_model_access a '
                 'JOIN "' + ir_model_obj._table + '" m '
                     'ON (a.model = m.id) '
                 'JOIN "' + user_group_obj._table + '" gu '
-                    'ON (gu.gid = a.group) '
+                    'ON (gu.gid = a."group") '
             'WHERE m.model = %s AND gu.uid = %s', (model_name, user,))
         row = cursor.fetchall()
         if row[0][0] is None:
@@ -208,7 +208,7 @@ class ModelAccess(ModelSQL, ModelView):
                     'FROM ir_model_access a ' \
                     'JOIN ir_model m ' \
                         'ON (a.model = m.id) ' \
-                    'WHERE a.group IS NULL AND m.model = %s', (model_name,))
+                    'WHERE a."group" IS NULL AND m.model = %s', (model_name,))
             row = cursor.fetchall()
             if row[0][0] is None:
                 return True
diff --git a/trytond/model/modelsql.py b/trytond/model/modelsql.py
index f24b3f1253..e58447d692 100644
--- a/trytond/model/modelsql.py
+++ b/trytond/model/modelsql.py
@@ -1600,7 +1600,7 @@ class ModelSQL(ModelStorage):
                 clause = 'IN'
                 if arg[1] == 'notinselect':
                     clause = 'NOT IN'
-                qu1.append('("%s".%s %s (%s))' % (table._table, arg[0], clause,
+                qu1.append('("%s"."%s" %s (%s))' % (table._table, arg[0], clause,
                     arg[2][0]))
                 qu2 += arg[2][1]
             elif arg[1] in ('in', 'not in'):
@@ -1616,7 +1616,7 @@ class ModelSQL(ModelStorage):
                         del arg2[xitem]
                     #TODO fix max_stack_depth
                     if len(arg2):
-                        qu1.append(('("%s".%s ' + arg[1] + ' (%s))') % \
+                        qu1.append(('("%s"."%s" ' + arg[1] + ' (%s))') % \
                                 (table._table, arg[0], ','.join(
                                     ['%s'] * len(arg2))))
                         if todel:
@@ -1672,14 +1672,14 @@ class ModelSQL(ModelStorage):
                                 (table._table, arg[0]))
                         qu2.append(False)
                     else:
-                        qu1.append('("%s".%s IS NULL)' % \
+                        qu1.append('("%s"."%s" IS NULL)' % \
                                 (table._table, arg[0]))
                 elif (arg[2] is False) and (arg[1] == '!='):
-                    qu1.append('("%s".%s IS NOT NULL)' % \
+                    qu1.append('("%s"."%s" IS NOT NULL)' % \
                             (table._table, arg[0]))
                 else:
                     if arg[0] == 'id':
-                        qu1.append('("%s".%s %s %%s)' % \
+                        qu1.append('("%s"."%s" %s %%s)' % \
                                 (table._table, arg[0], arg[1]))
                         qu2.append(arg[2])
                     else:
@@ -1700,7 +1700,7 @@ class ModelSQL(ModelStorage):
                             if arg[0] in table._columns:
                                 qu2.append(FIELDS[table._columns[arg[0]]._type].\
                                         sql_format(arg[2]))
-                        qu1.append('("%s".%s %s %%s)' % (table._table,
+                        qu1.append('("%s"."%s" %s %%s)' % (table._table,
                             arg[0], arg[1]))
                         if add_null:
                             qu1[-1] = '(' + qu1[-1] + ' OR ' + \