Fix bug on production :beers: