#399 Shortcode fallback