tweak goto/goto_route to eliminate random hangs