DAR-520 | Fix for calc width