Yet another scrolling fix