Fixed event order for optional components.