Bug fixing on fadeout