diff --git a/src/main/java/com/salesforce/phoenix/schema/MetaDataClient.java b/src/main/java/com/salesforce/phoenix/schema/MetaDataClient.java
index effca924..c161d22f 100644
--- a/src/main/java/com/salesforce/phoenix/schema/MetaDataClient.java
+++ b/src/main/java/com/salesforce/phoenix/schema/MetaDataClient.java
@@ -381,7 +381,7 @@ public MutationState createIndex(CreateIndexStatement statement) throws SQLExcep
             columns.add(indexCol);
         }
         
-        return doCreateTable(statement, null, (LinkedList<PColumn>) pkColumns, columns, familyNames, new PostIndexDDLCompiler(connection));
+        return doCreateTable(statement, null, pkColumns, columns, familyNames, new PostIndexDDLCompiler(connection));
     }
 
     private MutationState doCreateTable(CreateTableStatement statement, String pkName, LinkedList<PColumn> pkColumns, List<PColumn> columns,
@@ -457,7 +457,7 @@ private MutationState doCreateTable(CreateTableStatement statement, String pkNam
                 throw new SQLExceptionInfo.Builder(SQLExceptionCode.INVALID_BUCKET_NUM).build().buildException();
             }
             if (saltBucketNum != null) {
-                ((LinkedList<PColumn>) pkColumns).addFirst(SaltingUtil.SALTING_COLUMN);
+                pkColumns.addFirst(SaltingUtil.SALTING_COLUMN);
             }
             
             if (isIndex) {