Fix issue with product creation