Fixed issue with calculators