finalzed fix for margin issue