fixed env var generation