shortcodes issue fix