diff --git a/android/src/main/java/com/horcrux/svg/GlyphContext.java b/android/src/main/java/com/horcrux/svg/GlyphContext.java
index 107b4d73..21325b2e 100644
--- a/android/src/main/java/com/horcrux/svg/GlyphContext.java
+++ b/android/src/main/java/com/horcrux/svg/GlyphContext.java
@@ -196,18 +196,18 @@ class GlyphContext {
     }
 
     void popContext() {
-        mContextLength--;
-        top--;
-
-        mNodes.remove(mContextLength);
-        mFontContext.remove(mContextLength);
-
         mXsIndices.remove(mContextLength);
         mYsIndices.remove(mContextLength);
         mRsIndices.remove(mContextLength);
         mdXsIndices.remove(mContextLength);
         mdYsIndices.remove(mContextLength);
 
+        mContextLength--;
+        top--;
+
+        mNodes.remove(mContextLength);
+        mFontContext.remove(mContextLength);
+
         int x = mXsIndex;
         int y = mYsIndex;
         int r = mRsIndex;