Component bug fix