Fix C++ routing