Scroll glitch fix #2