fix for double message