Fix so it actually use shortcode attributes