Fixed bug with events and shortcode