Fix global location assignment