add env workaround