Fix calc width issue as per Nico report