Modify as cleanup_env add 1 more element

Fix bugs as cleanup_env changed