Fixed route bug.
Merged with master.