Fixed ENVIRONMENT substitution