AbstractEnvironment fix