Tweak workaround for moving to eob on save