Fix for Shortcode & Static Widget Bug