Fix order of message parsing.