fix avoid double message errors