CARE #37: Fixed calculation issue