Fix GoHome Bug