Emergency fix to tour refactor