Fixing routing bug