Component Fix