Fix the wrong component id issue