Fix the flicker