diff --git a/src/helma/framework/core/RequestEvaluator.java b/src/helma/framework/core/RequestEvaluator.java
index 6fbcca34..be26e190 100644
--- a/src/helma/framework/core/RequestEvaluator.java
+++ b/src/helma/framework/core/RequestEvaluator.java
@@ -272,8 +272,13 @@ public class RequestEvaluator implements Runnable {
 	                                        continue;
 	                                    if (isProperty)  // get next element as property
 	                                        currentNode = currentNode.getNode (pathItems[i], false);
-	                                    else  // get next element as subnode
-	                                        currentNode = currentNode.getSubnode (pathItems[i]);
+	                                    else {
+	                                        // try to get next element as subnode first, then fall back to property
+	                                        INode nextNode = currentNode.getSubnode (pathItems[i]);
+	                                        if (nextNode == null)
+	                                            nextNode = currentNode.getNode (pathItems[i], false);
+	                                        currentNode = nextNode;
+	                                    }
 	                                    isProperty = false;
 
 	                                    // add object to request path if suitable