Issue #369 - Fixing routing