Do the env var export much better