Fixed message restart