bugfix flickering