Fix for inproper merging of some components.

No match.