Fix component creation