Fix fading bug