Fix environments issue 3