fix messages dublicate