Deals better with self-closing tags