CARE #57: Fixed issue with lazily initialize