Fix global scope contamination