Bug fixing If component support