Fix environment var setting