Fixed blinking issue