1 files changed, 5 insertions, 2 deletions
diff --git a/tex/context/base/mkiv/attr-ini.lua b/tex/context/base/mkiv/attr-ini.lua
index dd971afc1..5d35d6ab5 100644
--- a/tex/context/base/mkiv/attr-ini.lua
+++ b/tex/context/base/mkiv/attr-ini.lua
@@ -34,6 +34,8 @@ attributes.states     = attributes.states   or { }
 attributes.handlers   = attributes.handlers or { }
 attributes.unsetvalue = -0x7FFFFFFF
 
+local currentfont     = font.current
+
 local names           = attributes.names
 local numbers         = attributes.numbers
 local list            = attributes.list
@@ -146,7 +148,7 @@ function attributes.save(name)
     end
     store[name] = {
         attr = t,
-        font = font.current(),
+        font = currentfont(),
     }
 end
 
@@ -163,7 +165,8 @@ function attributes.restore(name)
         end
         if font then
          -- tex.font = font
-            context.getvalue(fonts.hashes.csnames[font]) -- we don't have a direct way yet (will discuss it with taco)
+         -- context.getvalue(fonts.hashes.csnames[font])
+            currentfont(font)
         end
     end
  -- store[name] = nil