Fixes routing