pagination fixed again