possible production fix [#68344194]