potential flicker fix
potential flicker fix v2