Fix issue with different message, ugh