Fix for shortcode processing