fix issue with more components