Fixes #1024 (End Tour doesn't work)