Fix fadein fadeout issue