Fix shortcode bug