Fix variant edit issue