Fixed unscoped variables