Fixed some animations conflicts