Fix messages looping