Condition animation fixes