Fixed #5691
Merge pull request #5705 from Donkie/batonfix

Fixes #5691 - Batons incorrectly giving messages