diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/text/Length.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/text/Length.java
index 1dcb6a22..8ef43599 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/function/text/Length.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/text/Length.java
@@ -57,7 +57,7 @@ public class Length implements PathFunction {
                     while (null != tail && null != tail.getNext()) {
                         tail = tail.getNext();
                     }
-                    if (ctx.configuration().jsonProvider().isMap(model) && null != tail) {
+                    if (null != tail && !tail.toString().equals("[?]")) {
                         tail.setNext(new WildcardPathToken());
                     }
                 }