Quick fix for #63 and #64, no longer depend on format_html_join