fixed fading bugs