bugfix: routing handling