Unpublish option/option value bug

1. In product A i set Option 1, then go to options manager, unpublish Option 1.
In product edit view, i got this notice: ( ! ) Notice: Undefined index: option_values_1 in \administrator\components\com_eshop\views\product\tmpl\default.php on line 1199
In frontend, i still see this option in product details view.
2. In Option 1, i unpublish an option value, but it seems not to work. I still see this option value in Option config of product and still can select this option value at the frontend(product details view).

Any fix on this issue?