Flicker bug fixed...