fixed environments (bug remaining)