For ENG-5516, fix CME