Fix product range to skip nils as well as 0