Fixed message detection.