Now using gallery_shortcode() instead of do_shortcode()