Bullet-proofing around collapsing margins logic