Add work around for bug that affects scrolling