Animation fix

In Progress