Fix bug related to env variables