Fix bug for ENG-3153.