Globals outside of class fix