bugfix: reverted bugfix c40635d4 causing glitches during scroll and found another way of fixing it