Repeating messages bug fix