For ENG-6027, add necessary cast