Fix comp destroy issue