Fixed pagination issue with Page 1