diff --git a/spark-extension/src/main/scala/org/apache/spark/sql/blaze/BlazeConverters.scala b/spark-extension/src/main/scala/org/apache/spark/sql/blaze/BlazeConverters.scala
index 24dbd81d..ed0f7619 100644
--- a/spark-extension/src/main/scala/org/apache/spark/sql/blaze/BlazeConverters.scala
+++ b/spark-extension/src/main/scala/org/apache/spark/sql/blaze/BlazeConverters.scala
@@ -298,9 +298,9 @@ object BlazeConverters extends Logging {
     logDebug(s"  dataFilters: ${dataFilters}")
     logDebug(s"  tableIdentifier: ${tableIdentifier}")
     relation.fileFormat match {
-      case p if p.isInstanceOf[ParquetFileFormat] =>
+      case p if p.getClass().getName().endsWith("ParquetFileFormat") =>
         addRenameColumnsExec(Shims.get.createNativeParquetScanExec(exec))
-      case p if p.isInstanceOf[OrcFileFormat] =>
+      case p if p.getClass().getName().endsWith("OrcFileFormat") =>
         addRenameColumnsExec(Shims.get.createNativeOrcScanExec(exec))
       case _ => throw new NotImplementedError("Cannot convert non parquet/orc scan exec")
     }