diff --git a/src/hb-ot-cff1-table.hh b/src/hb-ot-cff1-table.hh
index 10ce8ff49..7a2c75e1e 100644
--- a/src/hb-ot-cff1-table.hh
+++ b/src/hb-ot-cff1-table.hh
@@ -656,7 +656,7 @@ struct NameDictValues
   static inline enum NameDictValIndex name_op_to_index (OpCode op)
   {
     switch (op) {
-      default:
+      default: // can't happen - just make some compiler happy
       case OpCode_version:
 	return version;
       case OpCode_Notice:
@@ -673,7 +673,9 @@ struct NameDictValues
 	return postscript;
       case OpCode_FontName:
 	return fontName;
-      }
+      case OpCode_BaseFontName:
+	return baseFontName;
+    }
   }
 
   unsigned int  values[ValCount];