Fixes #5691 - Batons incorrectly giving messages

Fixes #5691