FIX: Fix env var code