fix environment variables issue