Adding ComponentBuilderInspector
+ fix in ComponentBuilder