Animation fix #4