DF-2991 scrolling fix