fixed scroll check
Merge branch 'development'