Fixing env vars issue on fallback