Fix bug in the message prefix logic