Fix #983

We need a generic scrolling solution