flicker fix attempt #10