Add workaround for scrolling problem