CLC-1648 Small tweak in response to YH's feedback