CARE #80: Fixed indicator creation issue