Fix in Animation to avoid elements flashing