flicker fix attempt #7