Fix state change - return home