ENG-5053 bug fix