diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp
index 942736208..b13a6a71e 100644
--- a/src/mbgl/text/quads.cpp
+++ b/src/mbgl/text/quads.cpp
@@ -252,11 +252,12 @@ void getLineGlyphs(std::back_insert_iterator<GlyphInstances> glyphs,
     const bool glyphIsLogicallyForward = (glyphHorizontalOffsetFromAnchor >= 0) ^ upsideDown;
     const float glyphDistanceFromAnchor = std::fabs(glyphHorizontalOffsetFromAnchor);
     
+    const auto initialSegmentEnd = getSegmentEnd(glyphIsLogicallyForward, line, anchorSegment);
     VirtualSegment virtualSegment = {
         anchor.point,
-        getSegmentEnd(glyphIsLogicallyForward, line, anchorSegment),
+        initialSegmentEnd,
         anchorSegment,
-        getMinScaleForSegment(glyphDistanceFromAnchor, virtualSegment.anchor, virtualSegment.end),
+        getMinScaleForSegment(glyphDistanceFromAnchor, anchor.point, initialSegmentEnd),
         std::numeric_limits<float>::infinity()
     };