Fix issue with margin