Fix crash in prod