Fix ID mixup