fix bug of clicking the pagination
Merge branch 'develop'