fixing the message parser