Solved animation glitches