ENG-4617 fix.