finally fixed environments