diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 5905bb61c8..cadc70d3e9 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -91,14 +91,15 @@ objectSubClassMatch(
 	}
 
 #ifdef SLAP_NVALUES
-	assert(0 /* FIX ME */);
+	if( SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX( flags ) )
 #else
-	if( SLAP_IS_MR_ATTRIBUTE_SYNTAX_MATCH( flags ) ) {
+	if( SLAP_IS_MR_ATTRIBUTE_SYNTAX_MATCH( flags ) )
+#endif
+	{
 		*matchp = ( asserted != oc );
 	} else {
 		*matchp = !is_object_subclass( asserted, oc );
 	}
-#endif
 
 #if OCDEBUG
 #ifdef NEW_LOGGING