Fix fade out and in