Scroll panel bug fix