Fixing routing bug take 2
2.4.11