Fixed message update issue