Bugfix in the router