Fixed fade out issues