Fix in baseline calculation