diff --git a/v2/build/feature.jam b/v2/build/feature.jam
index 0005405eb..6f54adefb 100644
--- a/v2/build/feature.jam
+++ b/v2/build/feature.jam
@@ -469,7 +469,9 @@ rule validate-value-string ( feature value-string )
 
         if $($(feature).subfeatures)
         {
-            if ! ( $(value-string) in $($(feature).subfeatures) ) {
+            if ! ( $(value-string) in $($(feature).values) )
+               && ! ( $(value-string) in $($(feature).subfeatures) ) 
+            {
                 values = [ regex.split $(value-string) - ] ;
             }
         }