Try fixing sub-component handling.