Fix duplicated id