fix some Environment\Environment issue