Add Component issue fixed