Fixed message handling.