Fix message double up