Residence bug fixed