Fixed problem with transition to / from home