CARE #74: Fixed angular issue