diff --git a/ShExPath.bnf b/ShExPath.bnf
index 2f4fd72..289f52e 100644
--- a/ShExPath.bnf
+++ b/ShExPath.bnf
@@ -1,7 +1,7 @@
 ShExPathExpr ::= AbsolutePathExpr | RelativePathExpr
 AbsolutePathExpr ::= "/" RelativePathExpr
 RelativePathExpr ::= StepExpr ("/" StepExpr)*
-StepExpr ::= ContextTest? Index
+StepExpr ::= ContextTest? Index | ContextTest
 ContextTest ::= Context
 Context ::= "shapeAnd" | "shapeOr" | "shapeNot" | "nodeConstraint" | "shape"
           | "eachOf" | "oneOf" | "tripleConstraint"
diff --git a/ShExPath.html b/ShExPath.html
index 4af2674..ae79bee 100644
--- a/ShExPath.html
+++ b/ShExPath.html
@@ -352,7 +352,7 @@ <h2>Grammar</h2>
 ShExPathExpr             ::= AbsolutePathExpr | RelativePathExpr
 AbsolutePathExpr         ::= "/" RelativePathExpr
 RelativePathExpr         ::= StepExpr ("/" StepExpr)*
-<dfn>StepExpr</dfn>                 ::= ContextTest? ExprIndex
+<dfn>StepExpr</dfn>                 ::= ContextTest? ExprIndex | ContextTest
 ContextTest              ::= ShapeExprContext | TripleExprContext
 ShapeExprContext         ::= "ShapeAnd" | "ShapeOr" | "ShapeNot"
                            | "NodeConstraint" | "Shape"