diff --git a/oargen.py b/oargen.py
index 2006af94b2ae86821e0a649d98d0580c8c11a5ba..47857cd886588397982a13a78c61aa53aac16b1a 100755
--- a/oargen.py
+++ b/oargen.py
@@ -59,8 +59,12 @@ def prepare_oarsub(gpu, hosts, core, time,
     else:
         properties += "(gpu IS NULL)"
     if hosts:
-        for host in hosts:
-            properties += " OR host LIKE '{}'".format(host)
+        properties += " AND ("
+        for idx, host in enumerate(hosts):
+            if idx != 0:
+                properties += " OR "
+            properties += "host LIKE '{}'".format(host)
+        properties += ")"
     if ignore_hosts:
         for host in ignore_hosts:
             properties += " AND host NOT LIKE '{}'".format(host)