paging issue fix

paging issue fix
Merge pull request #1 from Shani-08/master

paging issue fix