fixed animation conflict