FINALLY fixed paging...