fixed pagination issue, #410