Fix black scrolling bug on 2.x