Final Animation fix