CARE #44: Fixed computed fields