Fix animation and repeating message