Fix another case of global variable use