Fix broken product list by PR #2140