More confident flicker fix now.