Fix routing error
Version 0.9, all tests pass, 3 pending unit tests