Not backward compatible

I think we got that fixed, didn’t we? Please let me know. I’ve tested this with all the shortcodes, both new and legacy.