Fixed message jumping