Sneaking the animation fix in here as well :/