fixed component issue