Fix for broken auto-scroll