CE-1125 Minor fix