Make it work in prod mode