Flicker fix attempt