Fixed Add/RemoveComponent