Fixed scroll bug.
Merge pull request #303 from ericwan78/issue-302

fixes #302