fixed shortcodes