Fixed always starting at home issue