flicker fix attempt #8