Fix bug with scrolling
Fix bug with non points counted