Fixed the initial fading issue