ENG-6820 Minor fix