Animation bugs fixed