diff --git a/AUTHORS b/AUTHORS
index edd0d8f81..fe19d3672 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -222,3 +222,4 @@ suggestions:
   Jack
   Kevin Ballard
   Sitaram Chamarty
+  Richard Boß
diff --git a/ChangeLog b/ChangeLog
index 37e5a150a..338232fa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -157,6 +157,8 @@
 - French localization (thanks to leowzukw).
 - Removed deprecated 'report.X.limit' feature.
 - Improved bash completion when TASKRC is exported.
+- Segfault when 'project:android' is split into 'and' and 'roid' (thanks to
+  Richard Boß).
 
 ------ current release ---------------------------
 
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index a6435fe89..6684a82ec 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -742,8 +742,8 @@ bool Lexer::is_ident (int c) const
 ////////////////////////////////////////////////////////////////////////////////
 bool Lexer::is_triple_op (int c0, int c1, int c2) const
 {
-  return (c0 == 'a' && c1 == 'n' && c2 == 'd') ||
-         (c0 == 'x' && c1 == 'o' && c2 == 'r') ||
+  return (c0 == 'a' && c1 == 'n' && c2 == 'd' && _boundary23) ||
+         (c0 == 'x' && c1 == 'o' && c2 == 'r' && _boundary23) ||
          (c0 == '!' && c1 == '=' && c2 == '=');
 }