Fix pending ids