Fixed bug of component selection
Fixed bug of component selection