Fixed the issue of calculation on checkout flow