Ensure set_env value is always applied
Merge pull request #2 from mremond/Ensure_set_env_applied

Ensure set_env value is always applied