almost fixed routing bug