fix: proper environment access
fix: fix env again
Merge branch 'master' into fix/invwarp

* master:
  fix: fix env again
  fix: proper environment access