Fixed message duplicate