Fix: no more flicker when scrolling