diff --git a/src/avatartranslator/AvatarGuard.java b/src/avatartranslator/AvatarGuard.java
index 21f7075d1020dab50383f23fb19160b1236f511d..7ffe78537578a6c98d84a147591055d7b7b2273d 100644
--- a/src/avatartranslator/AvatarGuard.java
+++ b/src/avatartranslator/AvatarGuard.java
@@ -144,7 +144,7 @@ public abstract class AvatarGuard {
                 if (indexLParen == -1)
                     indexLParen = indexRParen;
 
-                for (String delim: new String[] {"and", "or"}) {
+                for (String delim: new String[] {"and", "or", "&&", "||"}) {
 
                     int indexBinaryOp = sane.substring (0, indexLParen).indexOf (delim, indexRParen+1);
                     if (indexBinaryOp != -1) {