1 files changed, 4 insertions, 5 deletions
diff --git a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/GeoLongitudeValueSource.java b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/GeoLongitudeValueSource.java
index 4fbc8fd936..fd05d92d62 100644
--- a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/GeoLongitudeValueSource.java
+++ b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/GeoLongitudeValueSource.java
@@ -48,12 +48,11 @@ final class GeoLongitudeValueSource extends ValueSource {
         final MultiGeoPointValues values = leafData.getGeoPointValues();
         return new DoubleDocValues(this) {
             @Override
-            public double doubleVal(int doc) {
-                values.setDocument(doc);
-                if (values.count() == 0) {
-                    return 0.0;
+            public double doubleVal(int doc) throws IOException {
+                if (values.advanceExact(doc)) {
+                    return values.nextValue().getLon();
                 } else {
-                    return values.valueAt(0).getLon();
+                    return 0.0;
                 }
             }
         };