Moved scroll check to a different location.
Merge pull request #226 from ericwan78/issue-225

fixes #225