Better fix for setenv (..., NULL, ...)