Use environment shell fixes #422