Fix quirky environment variable issue
2.0.2