Fixed issue with env variables