added fix to await env method