Improved animation compability