Fixed !global issues