Fixed Animation Bugs