fix component support