Attempt 2 to fix animations