diff --git a/nixd/lib/Syntax/Parser/Parser.y b/nixd/lib/Syntax/Parser/Parser.y
index 340d409aa..5e8dd20c9 100644
--- a/nixd/lib/Syntax/Parser/Parser.y
+++ b/nixd/lib/Syntax/Parser/Parser.y
@@ -45,10 +45,11 @@
 
 %type <Node> start expr expr_function expr_if expr_op expr_select expr_simple
 %type <Node> string_parts
+%type <Node> string_attr
 %type <String> string ind_string;
 %type <ConcatStrings> string_parts_interpolated
 %type <InterpExpr> string_parts_interp_expr
-%type <Identifier> identifier
+%type <Identifier> identifier attr
 %type <IndStringParts> ind_string_parts
 %type <Formals> formals
 %type <Formal> formal
@@ -393,14 +394,21 @@ attrpath
 
 
 attr
-  : identifier
-  | OR_KW
+  : identifier {
+    $$ = $1;
+  }
+  | OR_KW {
+    auto Or = Data->State.Symbols.create("or");
+    $$ = decorateNode(new Identifier {
+      .Symbol = Or
+    }, yylloc, *Data);
+  }
 
 
 
 string_attr
-  : '"' string_parts '"'
-  | string_parts_interp_expr
+  : '"' string_parts '"' { $$ = $2; }
+  | string_parts_interp_expr { $$ = $1; }
 
 
 expr_list