Fix in ParameterCalculator