Fixed management of Product variant