Fix for empty env var