CLC-2179 Correct case per Yu-Hung's feedback