Fixed  shortcodes