Fixed bug with production environment