Fixing shortcodes