Fixed bug when changing home