Fix global unsetting