Fixing routes mapping