flicker fix #3