CARE #74: Fixed displaying issue