fix singleton component creation