One more fix for undefined Product.