Fixed fade bug