Fixed Issue with AutoScrolling