More accurate margin collapsing