UC1, UC2 - fix from internal testing