Fix bug where cannot run two consecutive routes
Merge branch 'jake'