Fix for inproper merging of some components.