fixed support for environment