Fix variable scoping (with a massive hammer)