Fix for the message parsing/replacement