ENG-5685: fix