Added option to prevent double messages