Fix for multiple components
Merge