fix a env.os bug
Merge branch 'tmp'