For ENG-5803, finally get Paul's suggestion correct