bugfix routing behaviour