Fix issue which stores environment variable substitution back to job configuration