Issue #401 - fixing routing