Fix flicker