Fix Message defect introduced by last commit.