Fix error, incorrect routing logic