UC11, UC12 - internal testing fix