Modify as cleanup_env add 1 more element
Merge pull request #371 from kylazhang/fix_bugs

Modify as cleanup_env add 1 more element