Fixed crash in prod