diff --git a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java
index 8b7eb4f31e..30b05204f9 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java
@@ -711,7 +711,7 @@ private static String getCallableCreatorMethodName(TypeNode callableVarExprType)
 
     // Special handling for pagination methods.
     if (callableVarExprType.reference().generics().size() == 2
-        && callableVarExprType.reference().generics().get(0).name().endsWith("PagedResponse")) {
+        && callableVarExprType.reference().generics().get(1).name().endsWith("PagedResponse")) {
       streamName = "Paged";
     } else {
       if (typeName.startsWith("Client")) {
diff --git a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java
index 9bd357bc15..7aa005b7f4 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java
@@ -283,7 +283,7 @@ public void generateServiceClasses() {
           + "            pagedExpandTransportSettings, settings.pagedExpandSettings(),"
           + " clientContext);\n"
           + "    this.pagedExpandPagedCallable =\n"
-          + "        callableFactory.createUnaryCallable(\n"
+          + "        callableFactory.createPagedCallable(\n"
           + "            pagedExpandTransportSettings, settings.pagedExpandSettings(),"
           + " clientContext);\n"
           + "    this.waitCallable =\n"