For ENG-5927, add missing return