CARE #86: Fixed calculation issue