Trying to fix the bug on the routers