diff --git a/v2/build/feature.jam b/v2/build/feature.jam
index db8a91f9f..b2cfd7cd0 100644
--- a/v2/build/feature.jam
+++ b/v2/build/feature.jam
@@ -582,7 +582,7 @@ rule compose ( composite-property : component-properties * )
                 $($(composite-property).components) ;
     }
 
-    if $(composite-property) in $(components)
+    if $(composite-property) in $(component-properties)
     {
         error composite property "$(composite-property)" cannot have itself as a component ;
     }
@@ -1002,13 +1002,20 @@ local rule __test__ ( )
     feature define : : free ;
     feature runtime-link : dynamic static : symmetric ;
     feature optimization : on off ;
-    feature variant : debug release : implicit composite symmetric ;
+    feature variant : debug release profile : implicit composite symmetric ;
     feature stdlib : native stlport ;
     feature magic : : free ;
 
     compose <variant>debug : <define>_DEBUG <optimization>off ;
     compose <variant>release : <define>NDEBUG <optimization>on ;
 
+
+    try ;
+    {
+        compose <variant>profile : <variant>profile ;
+    }
+    catch composite property <variant>profile cannot have itself as a component ;   
+
     extend-feature toolset : msvc metrowerks ;
     subfeature toolset gcc : version : 2.95.2 2.95.3 2.95.4
       3.0 3.0.1 3.0.2 ;