fixing shortcodes