fix environment changes