Fix component issue