Fix crash on production