Fix issue with production setup