See #949 - another fix for scroll up