diff --git a/product_variant_sale_price/__manifest__.py b/product_variant_sale_price/__manifest__.py
index de670560c..43baf374d 100644
--- a/product_variant_sale_price/__manifest__.py
+++ b/product_variant_sale_price/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Product Variant Sale Price",
     "summary": "Allows to write fixed prices in product variants",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Product Management",
     "website": "https://github.com/OCA/product-variant",
     "author": "Tecnativa, " "Odoo Community Association (OCA)",
diff --git a/product_variant_sale_price/models/product_product.py b/product_variant_sale_price/models/product_product.py
index 2e9585aec..4fc05544b 100644
--- a/product_variant_sale_price/models/product_product.py
+++ b/product_variant_sale_price/models/product_product.py
@@ -34,20 +34,18 @@ def _compute_lst_price(self):
         uom_model = self.env["uom.uom"]
         for product in self:
             price = product.fix_price or product.list_price
-            if "uom" in self.env.context:
-                price = product.uom_id._compute_price(
-                    price, uom_model.browse(self.env.context["uom"])
-                )
+            if self.env.context.get("uom"):
+                context_uom = uom_model.browse(self.env.context.get("uom"))
+                price = product.uom_id._compute_price(price, context_uom)
             product.lst_price = price
 
     def _compute_list_price(self):
         uom_model = self.env["uom.uom"]
         for product in self:
             price = product.fix_price or product.product_tmpl_id.list_price
-            if "uom" in self.env.context:
-                price = product.uom_id._compute_price(
-                    price, uom_model.browse(self.env.context["uom"])
-                )
+            if self.env.context.get("uom"):
+                context_uom = uom_model.browse(self.env.context.get("uom"))
+                price = product.uom_id._compute_price(price, context_uom)
             product.list_price = price
 
     def _inverse_product_lst_price(self):
diff --git a/setup/product_variant_sale_price/odoo/addons/product_variant_sale_price b/setup/product_variant_sale_price/odoo/addons/product_variant_sale_price
new file mode 120000
index 000000000..0d9d066df
--- /dev/null
+++ b/setup/product_variant_sale_price/odoo/addons/product_variant_sale_price
@@ -0,0 +1 @@
+../../../../product_variant_sale_price
\ No newline at end of file
diff --git a/setup/product_variant_sale_price/setup.py b/setup/product_variant_sale_price/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/product_variant_sale_price/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)