fixed some fading problems