Fixed double messages