ENG-7084 fixed a bug