better fix for the margin removal