Repeating message bug fix