first message duplication fix.