Fixed message parsing