Fixing components concatenation