Possible permanent fix for the collapsing margin issue