Fixed goHome... again