bugfix in routing