diff --git a/typesetters/base.lua b/typesetters/base.lua
index 6c65848..cea1692 100644
--- a/typesetters/base.lua
+++ b/typesetters/base.lua
@@ -936,7 +936,6 @@ function typesetter:makeHbox (content)
       depth = d,
       value = recentContribution,
       outputYourself = function (box, atypesetter, line)
-        local _post = _rtl_pre_post(box, atypesetter, line)
         local ox = atypesetter.frame.state.cursorX
         local oy = atypesetter.frame.state.cursorY
         SILE.outputter:setCursor(atypesetter.frame.state.cursorX, atypesetter.frame.state.cursorY)
@@ -945,7 +944,7 @@ function typesetter:makeHbox (content)
         end
         atypesetter.frame.state.cursorX = ox
         atypesetter.frame.state.cursorY = oy
-        _post()
+        atypesetter.frame:advanceWritingDirection(box:scaledWidth(line))
         SU.debug("hboxes", function ()
           SILE.outputter:debugHbox(box, box:scaledWidth(line))
           return "Drew debug outline around hbox"

diff --git a/packages/bidi/init.lua b/packages/bidi/init.lua
index b9eab11..c507cc2 100644
--- a/packages/bidi/init.lua
+++ b/packages/bidi/init.lua
@@ -204,6 +204,13 @@ function package.reorder (_, n, typesetter)
     if nl[i].is_nnode and levels[i].level %2 ~= base_level then
       SU.flip_in_place(nl[i].nodes)
       reverse_each_node(nl[i].nodes)
+    elseif nl[i].is_hbox and levels[i].level %2 ~= base_level and not nl[i].bidiDone then
+      for j = 1, #nl[i].value do
+        if nl[i].value[j].is_nnode then
+          SU.flip_in_place(nl[i].value[j].nodes)
+          reverse_each_node(nl[i].value[j].nodes)
+        end
+      end
     elseif nl[i].is_discretionary and levels[i].level %2 ~= base_level and not nl[i].bidiDone then
       for j = 1, #(nl[i].replacement) do
         if nl[i].replacement[j].is_nnode then