Fixed some blinking problem