Fix problem with Scroll