possibly fixed problems with production environment