Flicker fix