[21] Fix routing