bugfix flickering trial two