fix double messages