#16: Fixed pagination