flicker fix attempt #6