Auto scroll bug fix