Fixed shortcode issue