Fixed calculators creation in factories.