Fix margin collapse issue on main with jacket overflow

Fixes issue #168