Product shortcode patch to resolve #6654

Product shortcode patch to resolve #6654