Globals fix