Shortcode fix Closes #2299.