flicker fix # 2?