added next component id correction