fix scroll issue
Merge branch 'master' into chaos.io

fix scroll issue