Fixed autoscroll issue