Fix problem with Globals