This should fix #3
pagination fix #2