Possible implementation of scrolling fix