Fix in the timing of transitions