Attempt to fix the router bug