Fixed product_q issue