Fixed scroll-bug