Attempt to fix product-block --- incomplete