Revised solution to Animation leaking.