Fixing pagination again