Fixed dup_id code path