Fixed scroll issue with sample