Improve setEnv logic, fixes #528 (#535)

5 files changed