fix restore and suppress use of golbal