ENG-5374 fix.