Shortcodes: regression fix