Upgrading to the latest sufia.  This includes the route_set fix which fixes #9299